[Bridge] [PATCH v2] net: bridge: allow IPv6 when multicast flood is disabled

[Nikolay Aleksandrov]

On 01/03/17 11:55, Mike Manning wrote:
> 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: b6cb5ac8331b ("net: bridge: add per-port multicast flood flag")
> Cc: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>
> Signed-off-by: Mike Manning <mmanning at brocade.com>
> ---
>  net/bridge/br_forward.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
> index 6bfac29..902af6b 100644
> --- a/net/bridge/br_forward.c
> +++ b/net/bridge/br_forward.c
> @@ -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 */
> 

+CC bridge maintainers

Acked-by: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>