[PATCH net-next v4 09/14] net: bridge: mcast: track active state, VLAN snooping

Linus Lüssing
2026-03-07T04:46:16Z

If VLAN aware multicast snooping is enabled then we need to perform a
few extra checks to figure out if multicast snooping is actually enabled
for a specific VLAN, as there is then an additional per VLAN multicast
snooping toggle.

Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
---
net/bridge/br_multicast.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index cdc921b97243..1059984d8147 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1142,9 +1142,31 @@ static void br_multicast_update_active(struct net_bridge_mcast *brmctx)

lockdep_assert_held_once(&brmctx->br->multicast_lock);

- if (!br_opt_get(brmctx->br, BROPT_MULTICAST_ENABLED))
+ if (!br_opt_get(brmctx->br, BROPT_MULTICAST_ENABLED)) {
force_inactive = true;
+ goto update;
+ }

+ if (br_opt_get(brmctx->br, BROPT_MCAST_VLAN_SNOOPING_ENABLED)) {
+ /* with per-vlan snooping enabled there is an extra per-vlan
+ * toggle to enable/disable snooping which we must check
+ */
+ if (br_multicast_ctx_vlan_global_disabled(brmctx))
+ force_inactive = true;
+ /* with per-vlan snooping enabled the non-vlan multicast
+ * snooping context is inactive
+ */
+ else if (!br_multicast_ctx_is_vlan(brmctx))
+ force_inactive = true;
+ } else {
+ /* with per-vlan snooping disabled a vlan multicast
+ * snooping context is inactive
+ */
+ if (br_multicast_ctx_is_vlan(brmctx))
+ force_inactive = true;
+ }
+
+update:
br_ip4_multicast_update_active(brmctx, force_inactive);
br_ip6_multicast_update_active(brmctx, force_inactive);

@@ -4505,6 +4527,7 @@ void br_multicast_toggle_one_vlan(struct net_bridge_vlan *vlan, bool on)

spin_lock_bh(&br->multicast_lock);
vlan->priv_flags ^= BR_VLFLAG_MCAST_ENABLED;
+ br_multicast_update_active(&vlan->br_mcast_ctx);

if (on)
__br_multicast_open(&vlan->br_mcast_ctx);
--
2.53.0