diff options
| author |   Ido Schimmel <idosch@mellanox.com> | 2018-10-01 11:57:01 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-10-02 22:27:36 -0700 |
| commit | 6919622af3a8d92ee73886ebfe22c69ecf4c650c (patch) | |
| tree | c403e945b6af1eae219eefeb95705b9fc83be372 /net/bridge | |
| parent | Merge branch 'dpaa2-eth-Add-support-for-Rx-flow-classification' (diff) | |
| download | linux-dev-6919622af3a8d92ee73886ebfe22c69ecf4c650c.tar.xz linux-dev-6919622af3a8d92ee73886ebfe22c69ecf4c650c.zip | |
bridge: mcast: Default back to multicast enabled state
Commit 13cefad2f2c1 ("net: bridge: convert and rename mcast disabled")
converted the 'multicast_disabled' field to an option bit named
'BROPT_MULTICAST_ENABLED'.
While the old field was implicitly initialized to 0, the new field is
not initialized, resulting in the bridge defaulting to multicast
disabled state and breaking existing applications.
Fix this by explicitly initializing the option.
Fixes: 13cefad2f2c1 ("net: bridge: convert and rename mcast disabled")
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_multicast.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 928024d8360d..024139b51d3a 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1976,6 +1976,7 @@ void br_multicast_init(struct net_bridge *br) br->ip6_other_query.delay_time = 0; br->ip6_querier.port = NULL; #endif + br_opt_toggle(br, BROPT_MULTICAST_ENABLED, true); br_opt_toggle(br, BROPT_HAS_IPV6_ADDR, true); spin_lock_init(&br->multicast_lock); |