[NETNS]: Should build with CONFIG_SYSCTL=n

Previous NETNS patches broke CONFIG_SYSCTL=n case

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 7 deletions

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 44cb252d2f61..03db15b10309 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1542,7 +1542,6 @@ static void devinet_sysctl_unregister(struct in_device *idev)
         __devinet_sysctl_unregister(&idev->cnf);
         neigh_sysctl_unregister(idev->arp_parms);
 }
-#endif
 
 static struct ctl_table ctl_forward_entry[] = {
         {
@@ -1565,18 +1564,20 @@ static __net_initdata struct ctl_path net_ipv4_path[] = {
         { .procname = "ipv4", .ctl_name = NET_IPV4, },
         { },
 };
+#endif
 
 static __net_init int devinet_init_net(struct net *net)
 {
         int err;
-        struct ctl_table *tbl;
         struct ipv4_devconf *all, *dflt;
+#ifdef CONFIG_SYSCTL
+        struct ctl_table *tbl = ctl_forward_entry;
         struct ctl_table_header *forw_hdr;
+#endif
 
         err = -ENOMEM;
         all = &ipv4_devconf;
         dflt = &ipv4_devconf_dflt;
-        tbl = ctl_forward_entry;
 
         if (net != &init_net) {
                 all = kmemdup(all, sizeof(ipv4_devconf), GFP_KERNEL);
@@ -1587,6 +1588,7 @@ static __net_init int devinet_init_net(struct net *net)
                 if (dflt == NULL)
                         goto err_alloc_dflt;
 
+#ifdef CONFIG_SYSCTL
                 tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
                 if (tbl == NULL)
                         goto err_alloc_ctl;
@@ -1594,6 +1596,7 @@ static __net_init int devinet_init_net(struct net *net)
                 tbl[0].data = &all->data[NET_IPV4_CONF_FORWARDING - 1];
                 tbl[0].extra1 = all;
                 tbl[0].extra2 = net;
+#endif
         }
 
 #ifdef CONFIG_SYSCTL
@@ -1611,9 +1614,9 @@ static __net_init int devinet_init_net(struct net *net)
         forw_hdr = register_net_sysctl_table(net, net_ipv4_path, tbl);
         if (forw_hdr == NULL)
                 goto err_reg_ctl;
+        net->ipv4.forw_hdr = forw_hdr;
 #endif
 
-        net->ipv4.forw_hdr = forw_hdr;
         net->ipv4.devconf_all = all;
         net->ipv4.devconf_dflt = dflt;
         return 0;
@@ -1626,8 +1629,8 @@ err_reg_dflt:
 err_reg_all:
         if (tbl != ctl_forward_entry)
                 kfree(tbl);
-#endif
 err_alloc_ctl:
+#endif
         if (dflt != &ipv4_devconf_dflt)
                 kfree(dflt);
 err_alloc_dflt:
@@ -1639,15 +1642,15 @@ err_alloc_all:
 
 static __net_exit void devinet_exit_net(struct net *net)
 {
+#ifdef CONFIG_SYSCTL
         struct ctl_table *tbl;
 
         tbl = net->ipv4.forw_hdr->ctl_table_arg;
-#ifdef CONFIG_SYSCTL
         unregister_net_sysctl_table(net->ipv4.forw_hdr);
         __devinet_sysctl_unregister(net->ipv4.devconf_dflt);
         __devinet_sysctl_unregister(net->ipv4.devconf_all);
-#endif
         kfree(tbl);
+#endif
         kfree(net->ipv4.devconf_dflt);
         kfree(net->ipv4.devconf_all);
 }