[IPV4]: Convert IPv4 devconf to an array

This patch converts the ipv4_devconf config members (everything except
sysctl) to an array.  This allows easier manipulation which will be
needed later on to provide better management of default config values.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 6817d6485df5..53ef0f4bbdaa 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -37,12 +37,12 @@ static
 int ipv4_sysctl_forward(ctl_table *ctl, int write, struct file * filp,
                         void __user *buffer, size_t *lenp, loff_t *ppos)
 {
-        int val = ipv4_devconf.forwarding;
+        int val = IPV4_DEVCONF_ALL(FORWARDING);
         int ret;
 
         ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
 
-        if (write && ipv4_devconf.forwarding != val)
+        if (write && IPV4_DEVCONF_ALL(FORWARDING) != val)
                 inet_forward_change();
 
         return ret;
@@ -222,7 +222,7 @@ ctl_table ipv4_table[] = {
         {
                 .ctl_name       = NET_IPV4_FORWARD,
                 .procname       = "ip_forward",
-                .data           = &ipv4_devconf.forwarding,
+                .data           = &IPV4_DEVCONF_ALL(FORWARDING),
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = &ipv4_sysctl_forward,