net: bridge: vlan: enable mcast snooping for existing master vlans

We always create a vlan with enabled mcast snooping, so when the user
turns on per-vlan mcast contexts they'll get consistent behaviour with
the current situation, but one place wasn't updated when a bridge/master
vlan which already exists (created due to port vlans) is being added as
real bridge vlan (BRIDGE_VLAN_INFO_BRENTRY). We need to enable mcast
snooping for that vlan when that happens.

Fixes: 7b54aaaf53cb ("net: bridge: multicast: add vlan state initialization and control")
Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index cbc922681a76662afaf8c6afa83c4e02a5941d24..e25e288e7a854a2970f5bc94c070b47371c83ddb 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -694,6 +694,7 @@ static int br_vlan_add_existing(struct net_bridge *br,
                vlan->flags |= BRIDGE_VLAN_INFO_BRENTRY;
                vg->num_vlans++;
                *changed = true;
+               br_multicast_toggle_one_vlan(vlan, true);
        }
 
        if (__vlan_add_flags(vlan, flags))