Pārlūkot izejas kodu

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>
Eric Dumazet 13 gadi atpakaļ
vecāks
revīzija
0c7462a235

+ 0 - 6
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
 	The advertised MSS depends on the first hop route MTU, but will
 	never be lower than this setting.
 	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:
 IP Fragmentation:
 
 
 ipfrag_high_thresh - INTEGER
 ipfrag_high_thresh - INTEGER

+ 0 - 2
include/net/netns/ipv4.h

@@ -61,8 +61,6 @@ struct netns_ipv4 {
 	int sysctl_icmp_ratelimit;
 	int sysctl_icmp_ratelimit;
 	int sysctl_icmp_ratemask;
 	int sysctl_icmp_ratemask;
 	int sysctl_icmp_errors_use_inbound_ifaddr;
 	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];
 	unsigned int sysctl_ping_group_range[2];
 	long sysctl_tcp_mem[3];
 	long sysctl_tcp_mem[3];

+ 0 - 11
net/ipv4/sysctl_net_ipv4.c

@@ -783,13 +783,6 @@ static struct ctl_table ipv4_net_table[] = {
 		.mode		= 0644,
 		.mode		= 0644,
 		.proc_handler	= proc_dointvec
 		.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",
 		.procname	= "ping_group_range",
 		.data		= &init_net.ipv4.sysctl_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 =
 		table[5].data =
 			&net->ipv4.sysctl_icmp_ratemask;
 			&net->ipv4.sysctl_icmp_ratemask;
 		table[6].data =
 		table[6].data =
-			&net->ipv4.sysctl_rt_cache_rebuild_count;
-		table[7].data =
 			&net->ipv4.sysctl_ping_group_range;
 			&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[0] = 1;
 	net->ipv4.sysctl_ping_group_range[1] = 0;
 	net->ipv4.sysctl_ping_group_range[1] = 0;
 
 
-	net->ipv4.sysctl_rt_cache_rebuild_count = 4;
-
 	tcp_init_mem(net);
 	tcp_init_mem(net);
 
 
 	net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
 	net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);