aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/route.c
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2012-09-06 20:45:29 -0400
committerDavid S. Miller <davem@davemloft.net>2012-09-18 15:44:34 -0400
commitbafa6d9d89072c1a18853afe9ee5de05c491c13a (patch)
treed20837ee56043d318a8d9ea4f10085f0c46f81a9 /net/ipv4/route.c
parenta1f6d8f771d80ab0beea787aa4f1d02d2eacf22c (diff)
ipv4/route: arg delay is useless in rt_cache_flush()
Since route cache deletion (89aef8921bfbac22f), delay is no more used. Remove it. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r--net/ipv4/route.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 82cf2a722b23..f6436d3b207a 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -461,11 +461,7 @@ static void rt_cache_invalidate(struct net *net)
461 atomic_add(shuffle + 1U, &net->ipv4.rt_genid); 461 atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
462} 462}
463 463
464/* 464void rt_cache_flush(struct net *net)
465 * delay < 0 : invalidate cache (fast : entries will be deleted later)
466 * delay >= 0 : invalidate & flush cache (can be long)
467 */
468void rt_cache_flush(struct net *net, int delay)
469{ 465{
470 rt_cache_invalidate(net); 466 rt_cache_invalidate(net);
471} 467}
@@ -2345,7 +2341,7 @@ int ip_rt_dump(struct sk_buff *skb, struct netlink_callback *cb)
2345 2341
2346void ip_rt_multicast_event(struct in_device *in_dev) 2342void ip_rt_multicast_event(struct in_device *in_dev)
2347{ 2343{
2348 rt_cache_flush(dev_net(in_dev->dev), 0); 2344 rt_cache_flush(dev_net(in_dev->dev));
2349} 2345}
2350 2346
2351#ifdef CONFIG_SYSCTL 2347#ifdef CONFIG_SYSCTL
@@ -2354,16 +2350,7 @@ static int ipv4_sysctl_rtcache_flush(ctl_table *__ctl, int write,
2354 size_t *lenp, loff_t *ppos) 2350 size_t *lenp, loff_t *ppos)
2355{ 2351{
2356 if (write) { 2352 if (write) {
2357 int flush_delay; 2353 rt_cache_flush((struct net *)__ctl->extra1);
2358 ctl_table ctl;
2359 struct net *net;
2360
2361 memcpy(&ctl, __ctl, sizeof(ctl));
2362 ctl.data = &flush_delay;
2363 proc_dointvec(&ctl, write, buffer, lenp, ppos);
2364
2365 net = (struct net *)__ctl->extra1;
2366 rt_cache_flush(net, flush_delay);
2367 return 0; 2354 return 0;
2368 } 2355 }
2369 2356