---

yaml --- r: 189182 b: refs/heads/master c: 54c1a85 h: refs/heads/master v: v3
git-mirror · Mar 29, 2010 · ae527f9 · ae527f9
1 parent 156cdc1
commit ae527f9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git 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
@@ -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)