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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Jan 2022 11:42:37 +0000 (12:42 +0100)
commit62320f472fc235560926feb32dc1f64adf4c1387
tree867d3799a61eb6bb8a1d548f3f8843bd9775a5a2
parent5943eb7bbac34b5eedfb2fabbd8298dd0988a85f
net: bridge: mcast: fix br_multicast_ctx_vlan_global_disabled helper

[ Upstream commit 168fed986b3a7ec7b98cab1fe84e2f282b9e6a8f ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/bridge/br_private.h