From 4e4a6d4b447fc23e15089a3876cc19cb3355df9c Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Thu, 16 Dec 2010 17:42:54 +0000
Subject: [PATCH] --- yaml --- r: 225199 b: refs/heads/master c:
 d1ed113f1669390da9898da3beddcc058d938587 h: refs/heads/master i:   225197:
 5715e69ded84d52ed51a80e6bd5c6a658357bf10   225195:
 c5e4db44bde4e477968cc2567712ef5af725f0bc   225191:
 d10945aa2e83d6d59471e5c6176a87ab87557d3b   225183:
 84fde30b0f28f6ad5d181aed3368fe619d256909 v: v3

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

diff --git a/[refs] b/[refs]
index d30e9d3e0974..45dc9019652c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc3ef6605ea325e41b586a76aadc3f731c317504
+refs/heads/master: d1ed113f1669390da9898da3beddcc058d938587
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 99d1888af363..5b189c97c2fc 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -2672,7 +2672,6 @@ static int addrconf_ifdown(struct net_device *dev, int how)
 	/* Flush routes if device is being removed or it is not loopback */
 	if (how || !(dev->flags & IFF_LOOPBACK))
 		rt6_ifdown(net, dev);
-	neigh_ifdown(&nd_tbl, dev);
 
 	idev = __in6_dev_get(dev);
 	if (idev == NULL)