net decnet: Convert to use register_net_sysctl

Using an ascii path to register_net_sysctl as opposed to the slightly
awkward ctl_path allows for much simpler code.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index ce8a18471845e16f6fa7cbcd0fc6074dda31f366..f3924ab1e019f5efc22f6278021078889f43ce52 100644 (file)
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -209,15 +209,7 @@ static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms *
        struct dn_dev_sysctl_table *t;
        int i;
 
-#define DN_CTL_PATH_DEV        3
-
-       struct ctl_path dn_ctl_path[] = {
-               { .procname = "net",  },
-               { .procname = "decnet",  },
-               { .procname = "conf",  },
-               { /* to be set */ },
-               { },
-       };
+       char path[sizeof("net/decnet/conf/") + IFNAMSIZ];
 
        t = kmemdup(&dn_dev_sysctl, sizeof(*t), GFP_KERNEL);
        if (t == NULL)
@@ -228,15 +220,12 @@ static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms *
                t->dn_dev_vars[i].data = ((char *)parms) + offset;
        }
 
-       if (dev) {
-               dn_ctl_path[DN_CTL_PATH_DEV].procname = dev->name;
-       } else {
-               dn_ctl_path[DN_CTL_PATH_DEV].procname = parms->name;
-       }
+       snprintf(path, sizeof(path), "net/decnet/conf/%s",
+               dev? dev->name : parms->name);
 
        t->dn_dev_vars[0].extra1 = (void *)dev;
 
-       t->sysctl_header = register_net_sysctl_table(&init_net, dn_ctl_path, t->dn_dev_vars);
+       t->sysctl_header = register_net_sysctl(&init_net, path, t->dn_dev_vars);
        if (t->sysctl_header == NULL)
                kfree(t);
        else

diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
index 4380b8edea7228006ba0d30ebe1a239942f4631b..a55eeccaa72fd75474f9c6b1b5e0672b5833d4e5 100644 (file)
--- a/net/decnet/sysctl_net_decnet.c
+++ b/net/decnet/sysctl_net_decnet.c
@@ -351,15 +351,9 @@ static ctl_table dn_table[] = {
        { }
 };
 
-static struct ctl_path dn_path[] = {
-       { .procname = "net", },
-       { .procname = "decnet", },
-       { }
-};
-
 void dn_register_sysctl(void)
 {
-       dn_table_header = register_net_sysctl_table(&init_net, dn_path, dn_table);
+       dn_table_header = register_net_sysctl(&init_net, "net/decnet", dn_table);
 }
 
 void dn_unregister_sysctl(void)