---

yaml --- r: 232835 b: refs/heads/master c: 8f2771f h: refs/heads/master i: 232833: 270f599 232831: bfcff1b v: v3
git-mirror · Jan 27, 2011 · a64061d · a64061d
1 parent b2b4857
commit a64061d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2aa3665cf8510b1665ee2f5a9525cf7be6dec4f
+refs/heads/master: 8f2771f2b85aea4d0f9a0137ad3b63d1173c0962
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
@@ -194,7 +194,6 @@ static void ip6_dst_destroy(struct dst_entry *dst)
 		in6_dev_put(idev);
 	}
 	if (peer) {
-		BUG_ON(!(rt->rt6i_flags & RTF_CACHE));
 		rt->rt6i_peer = NULL;
 		inet_putpeer(peer);
 	}
@@ -204,9 +203,6 @@ void rt6_bind_peer(struct rt6_info *rt, int create)
 {
 	struct inet_peer *peer;
 
-	if (WARN_ON(!(rt->rt6i_flags & RTF_CACHE)))
-		return;
-
 	peer = inet_getpeer_v6(&rt->rt6i_dst.addr, create);
 	if (peer && cmpxchg(&rt->rt6i_peer, NULL, peer) != NULL)
 		inet_putpeer(peer);