diff options
| author | YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2010-03-28 07:15:45 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-01 16:02:08 -0700 |
| commit | 9c93e9c757c7d3d96027a06b9b4c4e37ca87ded7 (patch) | |
| tree | c608433a4455a06becd4197cfe6361e1edf5de1f /net | |
| parent | e9d2d8a8891b98d3217eb008ae9cd8b483e345e3 (diff) | |
| download | kernel-crypto-9c93e9c757c7d3d96027a06b9b4c4e37ca87ded7.tar.gz kernel-crypto-9c93e9c757c7d3d96027a06b9b4c4e37ca87ded7.tar.xz kernel-crypto-9c93e9c757c7d3d96027a06b9b4c4e37ca87ded7.zip | |
ipv6: Don't drop cache route entry unless timer actually expired.
[ Upstream commit 54c1a859efd9fd6cda05bc700315ba2519c14eba ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -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 c2bd74c5f8d..62322841e2e 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -897,12 +897,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) |