Patch "net: bridge: allow IPv6 when multicast flood is disabled" has been added to the 4.9-stable tree

This is a note to let you know that I've just added the patch titled

net: bridge: allow IPv6 when multicast flood is disabled

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
net-bridge-allow-ipv6-when-multicast-flood-is-disabled.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Mike Manning <[email protected]>
Date: Wed, 1 Mar 2017 09:55:28 +0000
Subject: net: bridge: allow IPv6 when multicast flood is disabled

From: Mike Manning <[email protected]>

[ Upstream commit 8953de2f02ad7b15e4964c82f9afd60f128e4e98 ]

Even with multicast flooding turned off, IPv6 ND should still work so that IPv6 connectivity is provided. Allow this by continuing to flood multicast traffic originated by us.

---
 net/bridge/br_forward.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

@@ -186,8 +186,9 @@ void br_flood(struct net_bridge *br, str
 		/* Do not flood unicast traffic to ports that turn it off */
 		if (pkt_type == BR_PKT_UNICAST && !(p->flags & BR_FLOOD))
 			continue;
+		/* Do not flood if mc off, except for traffic we originate */
 		if (pkt_type == BR_PKT_MULTICAST &&
-		    !(p->flags & BR_MCAST_FLOOD))
+		    !(p->flags & BR_MCAST_FLOOD) && skb->dev != br->dev)
 			continue;
 
 		/* Do not flood to ports that enable proxy ARP */

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/net-bridge-allow-ipv6-when-multicast-flood-is-disabled.patch