Thread (7 messages) 7 messages, 3 authors, 2014-06-05

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

From: David Laight <hidden>
Date: 2014-06-05 11:04:26
Also in: bridge

From: Toshiaki Makita
quoted hunk ↗ jump to hunk
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 <redacted>
---
 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help