projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
23a44b7
)
net: bridge: mcast: don't dump querier state if snooping is disabled
author
Nikolay Aleksandrov
<nikolay@nvidia.com>
Mon, 16 Aug 2021 10:11:32 +0000
(13:11 +0300)
committer
David S. Miller
<davem@davemloft.net>
Mon, 16 Aug 2021 12:57:59 +0000
(13:57 +0100)
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>
net/bridge/br_multicast.c
patch
|
blob
|
blame
|
history
diff --git
a/net/bridge/br_multicast.c
b/net/bridge/br_multicast.c
index 0e5d6ba034574ef96ef0479d39881c870aa4159e..9bdf12635871de66d84a7f5bf7437cb94f0de95d 100644
(file)
--- 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;