Commit e0a47d1f authored Jun 05, 2014 by Toshiaki Makita Committed by David S. Miller Jun 05, 2014

bridge: Fix incorrect judgment of promisc

br_manage_promisc() incorrectly expects br_auto_port() to return only 0
or 1, while it actually returns flags, i.e., a subset of BR_AUTO_MASK.

Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 5fb22ee5

net/bridge/br_if.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,8 @@ void br_manage_promisc(struct net_bridge *br)
		* This lets us disable promiscuous mode and write
		* this config to hw.
		*/
		if (br->auto_cnt <= br_auto_port(p))
		if (br->auto_cnt == 0 \|\|
		(br->auto_cnt == 1 && br_auto_port(p)))
		br_port_clear_promisc(p);
		else
		br_port_set_promisc(p);