diff options
| author | YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2010-03-28 07:15:45 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-28 19:34:26 -0700 |
| commit | 54c1a859efd9fd6cda05bc700315ba2519c14eba (patch) | |
| tree | c649e270baaa39f1dadbc0f2bc27842ea618dbb6 /net/ipv6/route.c | |
| parent | 7855f761998893bb6bf861d55df95036fc9e36ab (diff) | |
| download | linux-3.10-54c1a859efd9fd6cda05bc700315ba2519c14eba.tar.gz linux-3.10-54c1a859efd9fd6cda05bc700315ba2519c14eba.tar.bz2 linux-3.10-54c1a859efd9fd6cda05bc700315ba2519c14eba.zip | |
ipv6: Don't drop cache route entry unless timer actually expired.
This is ipv6 variant of the commit 5e016cbf6.. ("ipv4: Don't drop
redirected route cache entry unless PTMU actually expired")
by Guenter Roeck <guenter.roeck@ericsson.com>.
Remove cache route entry in ipv6_negative_advice() only if
the timer is expired.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 7fcb0e5d121..0d7713c5c20 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -890,12 +890,17 @@ static struct dst_entry *ip6_negative_advice(struct dst_entry *dst) struct rt6_info *rt = (struct rt6_info *) dst; if (rt) { - if (rt->rt6i_flags & RTF_CACHE) - ip6_del_rt(rt); - else + if (rt->rt6i_flags & RTF_CACHE) { + if (rt6_check_expired(rt)) { + ip6_del_rt(rt); + dst = NULL; + } + } else { dst_release(dst); + dst = NULL; + } } - return NULL; + return dst; } static void ip6_link_failure(struct sk_buff *skb) |