From a64061dd0a31b43b6fac252917e78f8c8e6fa792 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 27 Jan 2011 14:55:22 -0800
Subject: [PATCH] --- yaml --- r: 232835 b: refs/heads/master c:
 8f2771f2b85aea4d0f9a0137ad3b63d1173c0962 h: refs/heads/master i:   232833:
 270f599b40eb79f949e9c046361ee3438e1a3c73   232831:
 bfcff1b931088498b2064ae29e441e15d085f098 v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/route.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fb26008ed4fe..11f75c267c7f 100644
--- 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
index 1534508f6c68..28a85fc63cb8 100644
--- 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);