diff options
| author |   Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2018-09-26 17:01:03 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-09-26 10:04:23 -0700 |
| commit | 13cefad2f2c1d99b778c62b142e077779c5f9395 (patch) | |
| tree | 7c0b5ba7338364d991e9602628fa78c5786673a8 /net/bridge/br_private.h | |
| parent | net: bridge: convert group_addr_set option to a bit (diff) | |
| download | linux-dev-13cefad2f2c1d99b778c62b142e077779c5f9395.tar.xz linux-dev-13cefad2f2c1d99b778c62b142e077779c5f9395.zip | |
net: bridge: convert and rename mcast disabled
Convert mcast disabled to an option bit and while doing so convert the
logic to check if multicast is enabled instead. That is make the logic
follow the option value - if it's set then mcast is enabled and vice versa.
This avoids a few confusing places where we inverted the value that's being
set to follow the mcast_disabled logic.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Reviewed-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_private.h')
| -rw-r--r-- | net/bridge/br_private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index dda117ce386e..fb1a266cdac8 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -313,6 +313,7 @@ enum net_bridge_opts { BROPT_NF_CALL_IP6TABLES, BROPT_NF_CALL_ARPTABLES, BROPT_GROUP_ADDR_SET, + BROPT_MULTICAST_ENABLED, }; struct net_bridge { @@ -366,7 +367,6 @@ struct net_bridge { #ifdef CONFIG_BRIDGE_IGMP_SNOOPING unsigned char multicast_router; - u8 multicast_disabled:1; u8 multicast_querier:1; u8 multicast_query_use_ifaddr:1; u8 has_ipv6_addr:1; |