---

yaml --- r: 223633 b: refs/heads/master c: 29ba5fe h: refs/heads/master i: 223631: f81d59f v: v3
git-mirror · Dec 17, 2010 · 15e4bbc · 15e4bbc
1 parent d64a53f
commit 15e4bbc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d743b7e952261f4d9ee091100b6403f3ce8a2af
+refs/heads/master: 29ba5fed1bbd09c2cba890798c8f9eaab251401d
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
@@ -2669,7 +2669,9 @@ static int addrconf_ifdown(struct net_device *dev, int how)
 
 	ASSERT_RTNL();
 
-	rt6_ifdown(net, dev);
+	/* 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);