* [PATCH net-next] bridge: mcast: Default back to multicast enabled state
@ 2018-10-01 8:57 Ido Schimmel
2018-10-01 9:07 ` Nikolay Aleksandrov
2018-10-03 5:27 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Ido Schimmel @ 2018-10-01 8:57 UTC (permalink / raw)
To: netdev; +Cc: davem, nikolay, roopa, bridge, mlxsw, Ido Schimmel
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);
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] bridge: mcast: Default back to multicast enabled state
2018-10-01 8:57 [PATCH net-next] bridge: mcast: Default back to multicast enabled state Ido Schimmel
@ 2018-10-01 9:07 ` Nikolay Aleksandrov
2018-10-03 5:27 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Nikolay Aleksandrov @ 2018-10-01 9:07 UTC (permalink / raw)
To: Ido Schimmel, netdev; +Cc: davem, roopa, bridge, mlxsw
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>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net-next] bridge: mcast: Default back to multicast enabled state
2018-10-01 8:57 [PATCH net-next] bridge: mcast: Default back to multicast enabled state Ido Schimmel
2018-10-01 9:07 ` Nikolay Aleksandrov
@ 2018-10-03 5:27 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2018-10-03 5:27 UTC (permalink / raw)
To: idosch; +Cc: netdev, nikolay, roopa, bridge, mlxsw
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-03 12:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-01 8:57 [PATCH net-next] bridge: mcast: Default back to multicast enabled state Ido Schimmel
2018-10-01 9:07 ` Nikolay Aleksandrov
2018-10-03 5:27 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox