net: bridge: allow IPv6 when multicast flood is disabled

am: fa7c48fb3a

Change-Id: I5bbedf52bb3722528cb1fcab86751d6e2ba20269
This commit is contained in:
Mike Manning
2017-03-22 11:57:40 +00:00
committed by android-build-merger

View File

@@ -186,8 +186,9 @@ void br_flood(struct net_bridge *br, struct sk_buff *skb,
/* 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 */