[Bridge] [PATCH net-next] bridge: Fix incorrect judgment of promisc

David Laight David.Laight at ACULAB.COM
Thu Jun 5 11:03:57 UTC 2014


From: Toshiaki Makita
> 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 at lab.ntt.co.jp>
> ---
>  net/bridge/br_if.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
> index a08d2b8..6a07a40 100644
> --- a/net/bridge/br_if.c
> +++ b/net/bridge/br_if.c
> @@ -153,7 +153,7 @@ 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 <= !!br_auto_port(p))
>  				br_port_clear_promisc(p);
>  			else
>  				br_port_set_promisc(p);

Why not the less confusing:
			if (br->auto_cnt || br_auto_port(p))
and reverse the then/else lines?

	David





More information about the Bridge mailing list