From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: Re: [PATCH net-next-2.6 3/3] bridge: use rx_handler_data pointer to store net_bridge_port pointer V2 Date: Tue, 15 Jun 2010 09:30:35 -0700 Message-ID: <20100615093035.6f54c085@nehalam> References: <20100610133412.GC2618@psychotron.lab.eng.brq.redhat.com> <20100610133628.GF2618@psychotron.lab.eng.brq.redhat.com> <20100615132833.GB3797@psychotron.lab.eng.brq.redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, davem@davemloft.net, kaber@trash.net, eric.dumazet@gmail.com To: Jiri Pirko Return-path: Received: from mail.vyatta.com ([76.74.103.46]:52788 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755971Ab0FOQai (ORCPT ); Tue, 15 Jun 2010 12:30:38 -0400 In-Reply-To: <20100615132833.GB3797@psychotron.lab.eng.brq.redhat.com> Sender: netdev-owner@vger.kernel.org List-ID: On Tue, 15 Jun 2010 15:28:34 +0200 Jiri Pirko wrote: > diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c > index 7805bbf..e7f4703 100644 > --- a/drivers/net/ksz884x.c > +++ b/drivers/net/ksz884x.c > @@ -5718,7 +5718,7 @@ static void dev_set_promiscuous(struct net_device *dev, struct dev_priv *priv, > * from the bridge. > */ > if ((hw->features & STP_SUPPORT) && !promiscuous && > - dev->br_port) { > + dev->priv_flags & IFF_BRIDGE_PORT) { I like this patch except for one thing. The mask here should be surrounded by paren's to avoid the possible confusion about && and & in same if statement. The C precedence rules allow this but humans get confused.