diff options
| author |   Nikolay Aleksandrov <nikolay@nvidia.com> | 2021-08-10 18:29:28 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-08-11 13:34:41 +0100 |
| commit | 4d5b4e84c72451face4d7817697684196cbee50d (patch) | |
| tree | 399745a08b826682d4da6fdf78c74449b9a25511 /net/bridge/br_netlink.c | |
| parent | net: bridge: vlan: add support for mcast startup query interval global option (diff) | |
| download | linux-dev-4d5b4e84c72451face4d7817697684196cbee50d.tar.xz linux-dev-4d5b4e84c72451face4d7817697684196cbee50d.zip | |
net: bridge: mcast: move querier state to the multicast context
We need to have the querier state per multicast context in order to have
per-vlan control, so remove the internal option bit and move it to the
multicast context. Also annotate the lockless reads of the new variable.
Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_netlink.c')
| -rw-r--r-- | net/bridge/br_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index ded1b244dfcd..12616e9bdd11 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -1575,7 +1575,7 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev) nla_put_u8(skb, IFLA_BR_MCAST_QUERY_USE_IFADDR, br_opt_get(br, BROPT_MULTICAST_QUERY_USE_IFADDR)) || nla_put_u8(skb, IFLA_BR_MCAST_QUERIER, - br_opt_get(br, BROPT_MULTICAST_QUERIER)) || + READ_ONCE(br->multicast_ctx.multicast_querier)) || nla_put_u8(skb, IFLA_BR_MCAST_STATS_ENABLED, br_opt_get(br, BROPT_MULTICAST_STATS_ENABLED)) || nla_put_u32(skb, IFLA_BR_MCAST_HASH_ELASTICITY, RHT_ELASTICITY) || |