From 3d5318cbe98556461793f627d2b8fa75608b4b7f Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Fri, 13 Oct 2006 15:03:34 -0700
Subject: [PATCH] --- yaml --- r: 39692 b: refs/heads/master c:
 f1a95859a86fcdfd94f8b6dc3255d70d037e1caf h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 33458ae73596..d528a515a766 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: adaa70bbdfbc725e485179b06c8b23a20fbb7952
+refs/heads/master: f1a95859a86fcdfd94f8b6dc3255d70d037e1caf
diff --git a/trunk/net/ipv6/ndisc.c b/trunk/net/ipv6/ndisc.c
index 0304b5fe8d6a..41a8a5f06602 100644
--- a/trunk/net/ipv6/ndisc.c
+++ b/trunk/net/ipv6/ndisc.c
@@ -967,8 +967,6 @@ static void ndisc_recv_na(struct sk_buff *skb)
 		    ipv6_devconf.forwarding && ipv6_devconf.proxy_ndp &&
 		    pneigh_lookup(&nd_tbl, &msg->target, dev, 0)) {
 			/* XXX: idev->cnf.prixy_ndp */
-			WARN_ON(skb->dst != NULL &&
-				((struct rt6_info *)skb->dst)->rt6i_idev);
 			goto out;
 		}