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 4cb9cd2f2c390fc14289f918da8098af0549f5f2..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);
 
@@ -778,7 +778,6 @@ EXPORT_SYMBOL_GPL(net_ipv4_ctl_path);
 static __net_init int ipv4_sysctl_init_net(struct net *net)
 {
        struct ctl_table *table;
-       unsigned long limit;
 
        table = ipv4_net_table;
        if (!net_eq(net, &init_net)) {
@@ -815,11 +814,6 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
        net->ipv4.sysctl_rt_cache_rebuild_count = 4;
 
        tcp_init_mem(net);
-       limit = nr_free_buffer_pages() / 8;
-       limit = max(limit, 128UL);
-       net->ipv4.sysctl_tcp_mem[0] = limit / 4 * 3;
-       net->ipv4.sysctl_tcp_mem[1] = limit;
-       net->ipv4.sysctl_tcp_mem[2] = net->ipv4.sysctl_tcp_mem[0] * 2;
 
        net->ipv4.ipv4_hdr = register_net_sysctl_table(net,
                        net_ipv4_ctl_path, table);
@@ -863,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;
        }