Commit 6919622a authored Oct 01, 2018 by Ido Schimmel Committed by David S. Miller Oct 02, 2018

bridge: mcast: Default back to multicast enabled state



Commit 13cefad2 ("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: 13cefad2 ("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>

parent 42fac7bd

net/bridge/br_multicast.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1976,6 +1976,7 @@ void br_multicast_init(struct net_bridge *br)
	br->ip6_other_query.delay_time = 0;		br->ip6_other_query.delay_time = 0;
	br->ip6_querier.port = NULL;		br->ip6_querier.port = NULL;
	#endif		#endif
			br_opt_toggle(br, BROPT_MULTICAST_ENABLED, true);
	br_opt_toggle(br, BROPT_HAS_IPV6_ADDR, true);		br_opt_toggle(br, BROPT_HAS_IPV6_ADDR, true);

	spin_lock_init(&br->multicast_lock);		spin_lock_init(&br->multicast_lock);