Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-omap-h63xx.git] / net / decnet / dn_dev.c

diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 39c89c682047270991780019a7f2e79f12f6f035..1bbfce5f7a2dc851094d2a3e286f2e17a642864d 100644 (file)
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -173,10 +173,6 @@ static int dn_forwarding_sysctl(ctl_table *table, int __user *name, int nlen,
 static struct dn_dev_sysctl_table {
        struct ctl_table_header *sysctl_header;
        ctl_table dn_dev_vars[5];
-       ctl_table dn_dev_dev[2];
-       ctl_table dn_dev_conf_dir[2];
-       ctl_table dn_dev_proto_dir[2];
-       ctl_table dn_dev_root_dir[2];
 } dn_dev_sysctl = {
        NULL,
        {
@@ -224,30 +220,6 @@ static struct dn_dev_sysctl_table {
        },
        {0}
        },
-       {{
-               .ctl_name = 0,
-               .procname = "",
-               .mode = 0555,
-               .child = dn_dev_sysctl.dn_dev_vars
-       }, {0}},
-       {{
-               .ctl_name = NET_DECNET_CONF,
-               .procname = "conf",
-               .mode = 0555,
-               .child = dn_dev_sysctl.dn_dev_dev
-       }, {0}},
-       {{
-               .ctl_name = NET_DECNET,
-               .procname = "decnet",
-               .mode = 0555,
-               .child = dn_dev_sysctl.dn_dev_conf_dir
-       }, {0}},
-       {{
-               .ctl_name = CTL_NET,
-               .procname = "net",
-               .mode = 0555,
-               .child = dn_dev_sysctl.dn_dev_proto_dir
-       }, {0}}
 };
 
 static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms *parms)
@@ -255,6 +227,16 @@ 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", .ctl_name = CTL_NET, },
+               { .procname = "decnet", .ctl_name = NET_DECNET, },
+               { .procname = "conf", .ctl_name = NET_DECNET_CONF, },
+               { /* to be set */ },
+               { },
+       };
+
        t = kmemdup(&dn_dev_sysctl, sizeof(*t), GFP_KERNEL);
        if (t == NULL)
                return;
@@ -265,20 +247,16 @@ static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms *
        }
 
        if (dev) {
-               t->dn_dev_dev[0].procname = dev->name;
-               t->dn_dev_dev[0].ctl_name = dev->ifindex;
+               dn_ctl_path[DN_CTL_PATH_DEV].procname = dev->name;
+               dn_ctl_path[DN_CTL_PATH_DEV].ctl_name = dev->ifindex;
        } else {
-               t->dn_dev_dev[0].procname = parms->name;
-               t->dn_dev_dev[0].ctl_name = parms->ctl_name;
+               dn_ctl_path[DN_CTL_PATH_DEV].procname = parms->name;
+               dn_ctl_path[DN_CTL_PATH_DEV].ctl_name = parms->ctl_name;
        }
 
-       t->dn_dev_dev[0].child = t->dn_dev_vars;
-       t->dn_dev_conf_dir[0].child = t->dn_dev_dev;
-       t->dn_dev_proto_dir[0].child = t->dn_dev_conf_dir;
-       t->dn_dev_root_dir[0].child = t->dn_dev_proto_dir;
        t->dn_dev_vars[0].extra1 = (void *)dev;
 
-       t->sysctl_header = register_sysctl_table(t->dn_dev_root_dir);
+       t->sysctl_header = register_sysctl_paths(dn_ctl_path, t->dn_dev_vars);
        if (t->sysctl_header == NULL)
                kfree(t);
        else