---

yaml --- r: 288305 b: refs/heads/master c: d6ddef9 h: refs/heads/master i: 288303: bcf63a2 v: v3
git-mirror · Mar 6, 2012 · 6b46eab · 6b46eab
1 parent e247ecc
commit 6b46eab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34efc283a56adaef5756ac93065f46608674ea7d
+refs/heads/master: d6ddef9e641d1229d4ec841dc75ae703171c3e92
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
@@ -434,6 +434,10 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
 	/* Join all-node multicast group */
 	ipv6_dev_mc_inc(dev, &in6addr_linklocal_allnodes);
 
+	/* Join all-router multicast group if forwarding is set */
+	if (ndev->cnf.forwarding && dev && (dev->flags & IFF_MULTICAST))
+		ipv6_dev_mc_inc(dev, &in6addr_linklocal_allrouters);
+
 	return ndev;
 }