From: Nikolay Aleksandrov <nikolay@nvidia.com>
Date: Mon, 16 Aug 2021 10:11:32 +0000 (+0300)
Subject: net: bridge: mcast: don't dump querier state if snooping is disabled
X-Git-Tag: v5.15~428^2~193^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f137b7d4ecf8fca0891f435a198b3c8beec8a9d2;p=platform%2Fkernel%2Flinux-starfive.git

net: bridge: mcast: don't dump querier state if snooping is disabled

A minor improvement to avoid dumping mcast ctx querier state if snooping
is disabled for that context (either bridge or vlan).

Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 0e5d6ba..9bdf126 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -2943,6 +2943,10 @@ int br_multicast_dump_querier_state(struct sk_buff *skb,
 	struct net_bridge_port *p;
 	struct nlattr *nest;
 
+	if (!br_opt_get(brmctx->br, BROPT_MULTICAST_ENABLED) ||
+	    br_multicast_ctx_vlan_global_disabled(brmctx))
+		return 0;
+
 	nest = nla_nest_start(skb, nest_attr);
 	if (!nest)
 		return -EMSGSIZE;