From ae527f93fe7b0e8ea754c3425f4f5b4bdf279424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?=
 =?UTF-8?q?=E6=98=8E?= <yoshfuji@linux-ipv6.org>
Date: Sun, 28 Mar 2010 07:15:45 +0000
Subject: [PATCH] --- yaml --- r: 189182 b: refs/heads/master c:
 54c1a859efd9fd6cda05bc700315ba2519c14eba h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/net/ipv6/route.c | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4e1f81d195dd..5a8cd7ae9145 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7855f761998893bb6bf861d55df95036fc9e36ab
+refs/heads/master: 54c1a859efd9fd6cda05bc700315ba2519c14eba
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 7fcb0e5d1213..0d7713c5c206 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/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)