From 61f73eb9acada4781fb40878b1077d54846b3dc7 Mon Sep 17 00:00:00 2001
From: Li Wei <lw@cn.fujitsu.com>
Date: Tue, 6 Dec 2011 21:23:45 +0000
Subject: [PATCH] --- yaml --- r: 276779 b: refs/heads/master c:
 4af04aba93f47699e7ac33e7cfd4da22550e6114 h: refs/heads/master i:   276777:
 992c715b890bfad7ce10e5ce8d84a0811b40f221   276775:
 324e496a8429d7713d80ffdc9895e965fd3314cc v: v3

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

diff --git a/[refs] b/[refs]
index fe2d5b7c64b9..9f4e43efcebf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7ab5f1c323e137120561daeec75e91a1bd9ec8b
+refs/heads/master: 4af04aba93f47699e7ac33e7cfd4da22550e6114
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index cf88df82e2c2..36806def8cfd 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -1805,7 +1805,8 @@ static struct inet6_dev *addrconf_add_dev(struct net_device *dev)
 		return ERR_PTR(-EACCES);
 
 	/* Add default multicast route */
-	addrconf_add_mroute(dev);
+	if (!(dev->flags & IFF_LOOPBACK))
+		addrconf_add_mroute(dev);
 
 	/* Add link local route */
 	addrconf_add_lroute(dev);