Commit 168fed98 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by Jakub Kicinski
Browse files

net: bridge: mcast: fix br_multicast_ctx_vlan_global_disabled helper 



We need to first check if the context is a vlan one, then we need to
check the global bridge multicast vlan snooping flag, and finally the
vlan's multicast flag, otherwise we will unnecessarily enable vlan mcast
processing (e.g. querier timers).

Fixes: 7b54aaaf ("net: bridge: multicast: add vlan state initialization and control")
Signed-off-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Link: https://lore.kernel.org/r/20211228153142.536969-1-nikolay@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e22e45fc

net/bridge/br_private.h

+3 −3
Original line number Diff line number Diff line
@@ -1153,9 +1153,9 @@ br_multicast_port_ctx_get_global(const struct net_bridge_mcast_port *pmctx) 
static inline bool

br_multicast_ctx_vlan_global_disabled(const struct net_bridge_mcast *brmctx)

{

	return br_opt_get(brmctx->br, BROPT_MCAST_VLAN_SNOOPING_ENABLED) &&

	       br_multicast_ctx_is_vlan(brmctx) &&

	       !(brmctx->vlan->priv_flags & BR_VLFLAG_GLOBAL_MCAST_ENABLED);

	return br_multicast_ctx_is_vlan(brmctx) &&

	       (!br_opt_get(brmctx->br, BROPT_MCAST_VLAN_SNOOPING_ENABLED) ||

		!(brmctx->vlan->priv_flags & BR_VLFLAG_GLOBAL_MCAST_ENABLED));

}



static inline bool