arm: imx: tx6: mfgtool defconfig

[karo-tx-linux.git] / net / bridge / br_if.c

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index a08d2b8ebba63358979d517ee993d7ed3895ef41..3eca3fdf8fe1c7563150f735991e66380c4312ca 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -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);