From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <539052C0.2090409@lab.ntt.co.jp> Date: Thu, 05 Jun 2014 20:21:36 +0900 From: Toshiaki Makita MIME-Version: 1.0 References: <1401965851-6449-1-git-send-email-makita.toshiaki@lab.ntt.co.jp> <063D6719AE5E284EB5DD2968C1650D6D17257C08@AcuExch.aculab.com> In-Reply-To: <063D6719AE5E284EB5DD2968C1650D6D17257C08@AcuExch.aculab.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Bridge] [PATCH net-next] bridge: Fix incorrect judgment of promisc List-Id: Linux Ethernet Bridging List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Laight , "David S . Miller" , Stephen Hemminger Cc: Vlad Yasevich , "netdev@vger.kernel.org" , "bridge@lists.linux-foundation.org" (2014/06/05 20:03), David Laight wrote: > 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 >> --- >> 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? I'm respecting the original style, but I'm not particular about this style. I'll make less confusing one, thanks :) (Your suggested condition is not exactly the same as current one, even if reversing if/else. v2 will be different than it. Anyway, thanks.) Toshiaki Makita From mboxrd@z Thu Jan 1 00:00:00 1970 From: Toshiaki Makita Subject: Re: [PATCH net-next] bridge: Fix incorrect judgment of promisc Date: Thu, 05 Jun 2014 20:21:36 +0900 Message-ID: <539052C0.2090409@lab.ntt.co.jp> References: <1401965851-6449-1-git-send-email-makita.toshiaki@lab.ntt.co.jp> <063D6719AE5E284EB5DD2968C1650D6D17257C08@AcuExch.aculab.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Cc: Vlad Yasevich , "netdev@vger.kernel.org" , "bridge@lists.linux-foundation.org" To: David Laight , "David S . Miller" , Stephen Hemminger Return-path: In-Reply-To: <063D6719AE5E284EB5DD2968C1650D6D17257C08@AcuExch.aculab.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: bridge-bounces@lists.linux-foundation.org Errors-To: bridge-bounces@lists.linux-foundation.org List-Id: netdev.vger.kernel.org (2014/06/05 20:03), David Laight wrote: > 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 >> --- >> 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? I'm respecting the original style, but I'm not particular about this style. I'll make less confusing one, thanks :) (Your suggested condition is not exactly the same as current one, even if reversing if/else. v2 will be different than it. Anyway, thanks.) Toshiaki Makita