diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-04-19 13:24:33 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-21 01:21:17 (GMT) |
| commit | 5dd3df105b9f6cb7dd2472b59e028d0d1c878ecb (patch) | |
| tree | b12606e6e74ee6d07823eb268e09d899946279fd /net/ipv4/sysctl_net_ipv4.c | |
| parent | 4344475797a16ef948385780943f7a5cf09f0675 (diff) | |
| download | linux-fsl-qoriq-5dd3df105b9f6cb7dd2472b59e028d0d1c878ecb.tar.xz | |
net: Move all of the network sysctls without a namespace into init_net.
This makes it clearer which sysctls are relative to your current network
namespace.
This makes it a little less error prone by not exposing sysctls for the
initial network namespace in other namespaces.
This is the same way we handle all of our other network interfaces to
userspace and I can't honestly remember why we didn't do this for
sysctls right from the start.
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>
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
| -rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 34a62862..e7a6fa3 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -857,12 +857,12 @@ static __init int sysctl_ipv4_init(void) if (!i->procname) return -EINVAL; - hdr = register_sysctl_paths(net_ipv4_ctl_path, ipv4_table); + hdr = register_net_sysctl_table(&init_net, net_ipv4_ctl_path, ipv4_table); if (hdr == NULL) return -ENOMEM; if (register_pernet_subsys(&ipv4_sysctl_ops)) { - unregister_sysctl_table(hdr); + unregister_net_sysctl_table(hdr); return -ENOMEM; } |