summaryrefslogtreecommitdiffstats
path: root/net/sysctl_net.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-01-22 21:10:21 -0800
committerEric W. Biederman <ebiederm@xmission.com>2012-01-24 16:37:55 -0800
commitbd295b56cfae85f2dd6c2b03951480c91e6d08f3 (patch)
tree7f8667dbf6c297897b6427d228885d565e263c66 /net/sysctl_net.c
parent97324cd804b7b9fb6044e114329335db79810425 (diff)
downloadlinux-bd295b56cfae85f2dd6c2b03951480c91e6d08f3.tar.bz2
sysctl: Remove the unnecessary sysctl_set parent concept.
In sysctl_net register the two networking roots in the proper order. In register_sysctl walk the sysctl sets in the reverse order of the sysctl roots. Remove parent from ctl_table_set and setup_sysctl_set as it is no longer needed. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'net/sysctl_net.c')
-rw-r--r--net/sysctl_net.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index ffd67a6515a3..07c6b879c8b2 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -75,7 +75,6 @@ static struct ctl_table_root net_sysctl_ro_root = {
static int __net_init sysctl_net_init(struct net *net)
{
setup_sysctl_set(&net->sysctls,
- &net_sysctl_ro_root.default_set,
is_seen);
return 0;
}
@@ -96,9 +95,9 @@ static __init int net_sysctl_init(void)
ret = register_pernet_subsys(&sysctl_pernet_ops);
if (ret)
goto out;
- register_sysctl_root(&net_sysctl_root);
- setup_sysctl_set(&net_sysctl_ro_root.default_set, NULL, NULL);
+ setup_sysctl_set(&net_sysctl_ro_root.default_set, NULL);
register_sysctl_root(&net_sysctl_ro_root);
+ register_sysctl_root(&net_sysctl_root);
out:
return ret;
}