net: Move all of the network sysctls without a namespace into init_net.

[mirror_ubuntu-artful-kernel.git] / net / ipv6 / sysctl_net_ipv6.c

diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index 166a57c47d39cd4707bc48ad541afd23c34b12d1..99279c8aaf294a31339b5d64ca1957c2a2745223 100644 (file)
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -140,7 +140,7 @@ int ipv6_sysctl_register(void)
 {
        int err = -ENOMEM;
 
-       ip6_header = register_net_sysctl_rotable(net_ipv6_ctl_path, ipv6_rotable);
+       ip6_header = register_net_sysctl(&init_net, "net/ipv6", ipv6_rotable);
        if (ip6_header == NULL)
                goto out;
 
@@ -165,7 +165,7 @@ static struct ctl_table_header *ip6_base;
 
 int ipv6_static_sysctl_register(void)
 {
-       ip6_base = register_sysctl_paths(net_ipv6_ctl_path, ipv6_static_skeleton);
+       ip6_base = register_net_sysctl_table(&init_net, net_ipv6_ctl_path, ipv6_static_skeleton);
        if (ip6_base == NULL)
                return -ENOMEM;
        return 0;