| Message ID | 20181001085701.23295-1-idosch@mellanox.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] bridge: mcast: Default back to multicast enabled state | expand |
On 01/10/2018 11:57, Ido Schimmel wrote: > 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> > --- > net/bridge/br_multicast.c | 1 + > 1 file changed, 1 insertion(+) > > 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); > Thanks, Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
From: Ido Schimmel <idosch@mellanox.com> Date: Mon, 1 Oct 2018 11:57:01 +0300 > 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> Applied.
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);
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> --- net/bridge/br_multicast.c | 1 + 1 file changed, 1 insertion(+)