aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_sysfs_br.c
diff options
context:
space:
mode:
authorNikolay Aleksandrov <nikolay@nvidia.com>2021-08-10 18:29:30 +0300
committerDavid S. Miller <davem@davemloft.net>2021-08-11 13:34:41 +0100
commit62938182c35906c0ed4beb7845b93b8ffb937597 (patch)
treed1fd7bbacb3ad3c9c279d88fac32a01710cfafac /net/bridge/br_sysfs_br.c
parentnet: bridge: mcast: querier and query state affect only current context type (diff)
downloadlinux-dev-62938182c35906c0ed4beb7845b93b8ffb937597.tar.xz
linux-dev-62938182c35906c0ed4beb7845b93b8ffb937597.zip
net: bridge: vlan: add support for mcast querier global option
Add support to change and retrieve global vlan multicast querier state. We just need to pass multicast context to br_multicast_set_querier instead of bridge device and the rest of the logic remains the same. Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_sysfs_br.c')
-rw-r--r--net/bridge/br_sysfs_br.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 570edfd391f4..e1234bd8d5a0 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -447,13 +447,13 @@ static ssize_t multicast_querier_show(struct device *d,
char *buf)
{
struct net_bridge *br = to_bridge(d);
- return sprintf(buf, "%d\n", READ_ONCE(br->multicast_ctx.multicast_querier));
+ return sprintf(buf, "%d\n", br->multicast_ctx.multicast_querier);
}
static int set_multicast_querier(struct net_bridge *br, unsigned long val,
struct netlink_ext_ack *extack)
{
- return br_multicast_set_querier(br, val);
+ return br_multicast_set_querier(&br->multicast_ctx, val);
}
static ssize_t multicast_querier_store(struct device *d,