ipv4: remove rt_cache_rebuild_count

After IP route cache removal, rt_cache_rebuild_count is no longer
used.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 406a5226220d2d9e985bb549a972d354c59f0181..ca447b35b8333106cdd19649d943d80cdb12cc1e 100644 (file)
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -48,12 +48,6 @@ min_adv_mss - INTEGER
        The advertised MSS depends on the first hop route MTU, but will
        never be lower than this setting.
 
-rt_cache_rebuild_count - INTEGER
-       The per net-namespace route cache emergency rebuild threshold.
-       Any net-namespace having its route cache rebuilt due to
-       a hash bucket chain being too long more than this many times
-       will have its route caching disabled
-
 IP Fragmentation:
 
 ipfrag_high_thresh - INTEGER

diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 0ffb8e31f3cd3c2785371c636260dd51f91a89d2..1474dd65c66f558999a70f38c081dea247fbee5a 100644 (file)
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -61,8 +61,6 @@ struct netns_ipv4 {
        int sysctl_icmp_ratelimit;
        int sysctl_icmp_ratemask;
        int sysctl_icmp_errors_use_inbound_ifaddr;
-       int sysctl_rt_cache_rebuild_count;
-       int current_rt_cache_rebuild_count;
 
        unsigned int sysctl_ping_group_range[2];
        long sysctl_tcp_mem[3];

diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 5840c3255721d8dafa923f86aea0c065c149d16b..4b6487a68279a888f28e0ae600395c313dd36fac 100644 (file)
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -783,13 +783,6 @@ static struct ctl_table ipv4_net_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_dointvec
        },
-       {
-               .procname       = "rt_cache_rebuild_count",
-               .data           = &init_net.ipv4.sysctl_rt_cache_rebuild_count,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec
-       },
        {
                .procname       = "ping_group_range",
                .data           = &init_net.ipv4.sysctl_ping_group_range,
@@ -829,8 +822,6 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
                table[5].data =
                        &net->ipv4.sysctl_icmp_ratemask;
                table[6].data =
-                       &net->ipv4.sysctl_rt_cache_rebuild_count;
-               table[7].data =
                        &net->ipv4.sysctl_ping_group_range;
 
        }
@@ -842,8 +833,6 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
        net->ipv4.sysctl_ping_group_range[0] = 1;
        net->ipv4.sysctl_ping_group_range[1] = 0;
 
-       net->ipv4.sysctl_rt_cache_rebuild_count = 4;
-
        tcp_init_mem(net);
 
        net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);