aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/reassembly.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-04-19 09:22:55 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-20 21:21:17 -0400
commit4344475797a16ef948385780943f7a5cf09f0675 (patch)
tree1cd80eae7c46a1e3f2f5c546212d84d007a5dffa /net/ipv6/reassembly.c
parent2ca794e5e86c800d7f98c4ebb8bd325099c0afe8 (diff)
net: Kill register_sysctl_rotable
register_sysctl_rotable never caught on as an interesting way to register sysctls. My take on the situation is that what we want are sysctls that we can only see in the initial network namespace. What we have implemented with register_sysctl_rotable are sysctls that we can see in all of the network namespaces and can only change in the initial network namespace. That is a very silly way to go. Just register the network sysctls in the initial network namespace and we don't have any weird special cases to deal with. The sysctls affected are: /proc/sys/net/ipv4/ipfrag_secret_interval /proc/sys/net/ipv4/ipfrag_max_dist /proc/sys/net/ipv6/ip6frag_secret_interval /proc/sys/net/ipv6/mld_max_msf I really don't expect anyone will miss them if they can't read them in a child user namespace. CC: Pavel Emelyanov <xemul@openvz.org> 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/ipv6/reassembly.c')
-rw-r--r--net/ipv6/reassembly.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 9447bd69873a..42f4f7c0948a 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -674,7 +674,7 @@ static struct ctl_table_header *ip6_ctl_header;
674 674
675static int ip6_frags_sysctl_register(void) 675static int ip6_frags_sysctl_register(void)
676{ 676{
677 ip6_ctl_header = register_net_sysctl_rotable(net_ipv6_ctl_path, 677 ip6_ctl_header = register_net_sysctl(&init_net, "net/ipv6",
678 ip6_frags_ctl_table); 678 ip6_frags_ctl_table);
679 return ip6_ctl_header == NULL ? -ENOMEM : 0; 679 return ip6_ctl_header == NULL ? -ENOMEM : 0;
680} 680}