UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Eric W. Biederman 2012-04-19 13:40:37 +00:00 committed by David S. Miller
parent 8f40a1f982
commit 9bdcc88fa0
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/decnet/dn_dev.c
View File

@ -209,15 +209,7 @@ static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms *
struct dn_dev_sysctl_table *t; struct dn_dev_sysctl_table *t;
int i; int i;
#define DN_CTL_PATH_DEV 3 char path[sizeof("net/decnet/conf/") + IFNAMSIZ];
struct ctl_path dn_ctl_path[] = {
{ .procname = "net", },
{ .procname = "decnet", },
{ .procname = "conf", },
{ /* to be set */ },
{ },
};
t = kmemdup(&dn_dev_sysctl, sizeof(*t), GFP_KERNEL); t = kmemdup(&dn_dev_sysctl, sizeof(*t), GFP_KERNEL);
if (t == NULL) 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; t->dn_dev_vars[i].data = ((char *)parms) + offset;
} }
if (dev) { snprintf(path, sizeof(path), "net/decnet/conf/%s",
dn_ctl_path[DN_CTL_PATH_DEV].procname = dev->name; dev? dev->name : parms->name);
} else {
dn_ctl_path[DN_CTL_PATH_DEV].procname = parms->name;
}
t->dn_dev_vars[0].extra1 = (void *)dev; 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) if (t->sysctl_header == NULL)
kfree(t); kfree(t);
else else

8
net/decnet/sysctl_net_decnet.c
View File

@ -351,15 +351,9 @@ static ctl_table dn_table[] = {
{ } { }
}; };
static struct ctl_path dn_path[] = {
{ .procname = "net", },
{ .procname = "decnet", },
{ }
};
void dn_register_sysctl(void) 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) void dn_unregister_sysctl(void)