Commit fa7c48fb authored by Mike Manning's avatar Mike Manning Committed by Greg Kroah-Hartman

net: bridge: allow IPv6 when multicast flood is disabled

[ Upstream commit 8953de2f ]

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.

Fixes: b6cb5ac8 ("net: bridge: add per-port multicast flood flag")
Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarMike Manning <mmanning@brocade.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bbaeb9b7
...@@ -186,8 +186,9 @@ void br_flood(struct net_bridge *br, struct sk_buff *skb, ...@@ -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 */ /* Do not flood unicast traffic to ports that turn it off */
if (pkt_type == BR_PKT_UNICAST && !(p->flags & BR_FLOOD)) if (pkt_type == BR_PKT_UNICAST && !(p->flags & BR_FLOOD))
continue; continue;
/* Do not flood if mc off, except for traffic we originate */
if (pkt_type == BR_PKT_MULTICAST && if (pkt_type == BR_PKT_MULTICAST &&
!(p->flags & BR_MCAST_FLOOD)) !(p->flags & BR_MCAST_FLOOD) && skb->dev != br->dev)
continue; continue;
/* Do not flood to ports that enable proxy ARP */ /* Do not flood to ports that enable proxy ARP */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment