| Message ID | 20211228153142.536969-1-nikolay@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 168fed986b3a7ec7b98cab1fe84e2f282b9e6a8f |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2] net: bridge: mcast: fix br_multicast_ctx_vlan_global_disabled helper | expand |
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Tue, 28 Dec 2021 17:31:42 +0200 you wrote: > 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: 7b54aaaf53cb ("net: bridge: multicast: add vlan state initialization and control") > Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com> > > [...] Here is the summary with links: - [net,v2] net: bridge: mcast: fix br_multicast_ctx_vlan_global_disabled helper https://git.kernel.org/netdev/net/c/168fed986b3a You are awesome, thank you!
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 2187a0c3fd22..e8c6ee322c71 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -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
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: 7b54aaaf53cb ("net: bridge: multicast: add vlan state initialization and control") Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com> --- v2: fix indentation warning by checkpatch net/bridge/br_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)