diff options
author | Eric Dumazet <edumazet@google.com> | 2012-07-30 03:14:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-30 17:53:22 -0400 |
commit | 0c7462a2351b4cc502f326aad7fedd04909928be (patch) | |
tree | 0f60f604b836d310d7a587b701232870d00f3446 | |
parent | 404e0a8b6a55d5e1cd138c6deb1bca9abdf75d8c (diff) |
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>
-rw-r--r-- | Documentation/networking/ip-sysctl.txt | 6 | ||||
-rw-r--r-- | include/net/netns/ipv4.h | 2 | ||||
-rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 11 |
3 files changed, 0 insertions, 19 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index 406a5226220d..ca447b35b833 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt | |||
@@ -48,12 +48,6 @@ min_adv_mss - INTEGER | |||
48 | The advertised MSS depends on the first hop route MTU, but will | 48 | The advertised MSS depends on the first hop route MTU, but will |
49 | never be lower than this setting. | 49 | never be lower than this setting. |
50 | 50 | ||
51 | rt_cache_rebuild_count - INTEGER | ||
52 | The per net-namespace route cache emergency rebuild threshold. | ||
53 | Any net-namespace having its route cache rebuilt due to | ||
54 | a hash bucket chain being too long more than this many times | ||
55 | will have its route caching disabled | ||
56 | |||
57 | IP Fragmentation: | 51 | IP Fragmentation: |
58 | 52 | ||
59 | ipfrag_high_thresh - INTEGER | 53 | ipfrag_high_thresh - INTEGER |
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index 0ffb8e31f3cd..1474dd65c66f 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h | |||
@@ -61,8 +61,6 @@ struct netns_ipv4 { | |||
61 | int sysctl_icmp_ratelimit; | 61 | int sysctl_icmp_ratelimit; |
62 | int sysctl_icmp_ratemask; | 62 | int sysctl_icmp_ratemask; |
63 | int sysctl_icmp_errors_use_inbound_ifaddr; | 63 | int sysctl_icmp_errors_use_inbound_ifaddr; |
64 | int sysctl_rt_cache_rebuild_count; | ||
65 | int current_rt_cache_rebuild_count; | ||
66 | 64 | ||
67 | unsigned int sysctl_ping_group_range[2]; | 65 | unsigned int sysctl_ping_group_range[2]; |
68 | long sysctl_tcp_mem[3]; | 66 | long sysctl_tcp_mem[3]; |
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 5840c3255721..4b6487a68279 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c | |||
@@ -784,13 +784,6 @@ static struct ctl_table ipv4_net_table[] = { | |||
784 | .proc_handler = proc_dointvec | 784 | .proc_handler = proc_dointvec |
785 | }, | 785 | }, |
786 | { | 786 | { |
787 | .procname = "rt_cache_rebuild_count", | ||
788 | .data = &init_net.ipv4.sysctl_rt_cache_rebuild_count, | ||
789 | .maxlen = sizeof(int), | ||
790 | .mode = 0644, | ||
791 | .proc_handler = proc_dointvec | ||
792 | }, | ||
793 | { | ||
794 | .procname = "ping_group_range", | 787 | .procname = "ping_group_range", |
795 | .data = &init_net.ipv4.sysctl_ping_group_range, | 788 | .data = &init_net.ipv4.sysctl_ping_group_range, |
796 | .maxlen = sizeof(init_net.ipv4.sysctl_ping_group_range), | 789 | .maxlen = sizeof(init_net.ipv4.sysctl_ping_group_range), |
@@ -829,8 +822,6 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) | |||
829 | table[5].data = | 822 | table[5].data = |
830 | &net->ipv4.sysctl_icmp_ratemask; | 823 | &net->ipv4.sysctl_icmp_ratemask; |
831 | table[6].data = | 824 | table[6].data = |
832 | &net->ipv4.sysctl_rt_cache_rebuild_count; | ||
833 | table[7].data = | ||
834 | &net->ipv4.sysctl_ping_group_range; | 825 | &net->ipv4.sysctl_ping_group_range; |
835 | 826 | ||
836 | } | 827 | } |
@@ -842,8 +833,6 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) | |||
842 | net->ipv4.sysctl_ping_group_range[0] = 1; | 833 | net->ipv4.sysctl_ping_group_range[0] = 1; |
843 | net->ipv4.sysctl_ping_group_range[1] = 0; | 834 | net->ipv4.sysctl_ping_group_range[1] = 0; |
844 | 835 | ||
845 | net->ipv4.sysctl_rt_cache_rebuild_count = 4; | ||
846 | |||
847 | tcp_init_mem(net); | 836 | tcp_init_mem(net); |
848 | 837 | ||
849 | net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table); | 838 | net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table); |