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

[deliverable/linux.git] / net / ipv4 / sysctl_net_ipv4.c

diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 7a7724da9bff61eb51cb2ad70f8a92c135f1dcfa..e7a6fa3d70bb5d295b6be1e0794e7d7c9681af14 100644 (file)
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -78,7 +78,7 @@ static int ipv4_local_port_range(ctl_table *table, int write,
 static void inet_get_ping_group_range_table(struct ctl_table *table, gid_t *low, gid_t *high)
 {
        gid_t *data = table->data;
-       unsigned seq;
+       unsigned int seq;
        do {
                seq = read_seqbegin(&sysctl_local_ports.lock);
 
@@ -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;
        }