net: bridge: mcast: fix br_multicast_ctx_vlan_global_disabled helper
authorNikolay Aleksandrov <nikolay@nvidia.com>
Tue, 28 Dec 2021 15:31:42 +0000 (17:31 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 30 Dec 2021 01:49:45 +0000 (17:49 -0800)
commit168fed986b3a7ec7b98cab1fe84e2f282b9e6a8f
tree559d70617e072067cb48073d22dd99a6b87f0339
parente22e45fc9e41bf9fcc1e92cfb78eb92786728ef0
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: 7b54aaaf53cb ("net: bridge: multicast: add vlan state initialization and control")
Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Link: https://lore.kernel.org/r/20211228153142.536969-1-nikolay@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/bridge/br_private.h