aboutsummaryrefslogtreecommitdiffstats
path: root/net/sysctl_net.c
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2008-07-27 08:59:33 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-27 09:45:34 -0700
commiteeb61f719c00c626115852bbc91189dc3011a844 (patch)
treeb52cddf222ee55082c0aeee5627049aa0d12afa4 /net/sysctl_net.c
parentbfbcf034798b2ca45338cee5049b5694b7ddc865 (diff)
downloadkernel_samsung_smdk4412-eeb61f719c00c626115852bbc91189dc3011a844.tar.gz
kernel_samsung_smdk4412-eeb61f719c00c626115852bbc91189dc3011a844.tar.bz2
kernel_samsung_smdk4412-eeb61f719c00c626115852bbc91189dc3011a844.zip
missing bits of net-namespace / sysctl
Piss-poor sysctl registration API strikes again, film at 11... What we really need is _pathname_ required to be present in already registered table, so that kernel could warn about bad order. That's the next target for sysctl stuff (and generally saner and more explicit order of initialization of ipv[46] internals wouldn't hurt either). For the time being, here are full fixups required by ..._rotable() stuff; we make per-net sysctl sets descendents of "ro" one and make sure that sufficient skeleton is there before we start registering per-net sysctls. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/sysctl_net.c')
-rw-r--r--net/sysctl_net.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index cefbc367d8b..972201cd5fa 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -73,7 +73,9 @@ static struct ctl_table_root net_sysctl_ro_root = {
static int sysctl_net_init(struct net *net)
{
- setup_sysctl_set(&net->sysctls, NULL, is_seen);
+ setup_sysctl_set(&net->sysctls,
+ &net_sysctl_ro_root.default_set,
+ is_seen);
return 0;
}