From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Matt Carlson" Subject: Re: [PATCH] TG3: &&/|| confusion Date: Tue, 17 Feb 2009 10:34:39 -0800 Message-ID: <20090217183439.GA7201@xw6200.broadcom.net> References: <49989494.6010804@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: "'Roel Kluin'" , "netdev@vger.kernel.org" , "Andrew Morton" , "Matthew Carlson" To: "Michael Chan" Return-path: Received: from mms3.broadcom.com ([216.31.210.19]:4724 "EHLO MMS3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752898AbZBQSet (ORCPT ); Tue, 17 Feb 2009 13:34:49 -0500 In-Reply-To: Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: On Mon, Feb 16, 2009 at 09:27:19AM -0800, Michael Chan wrote: > Roel Kluin wrote: > > > phyid Can't be both TG3_PHY_OUI_1 and TG3_PHY_OUI_2 and TG3_PHY_OUI_3. > > > > Signed-off-by: Roel Kluin > > --- > > // vi drivers/net/tg3.h +2698 > > #define TG3_PHY_OUI_1 0x00206000 > > #define TG3_PHY_OUI_2 0x0143bc00 > > #define TG3_PHY_OUI_3 0x03625c00 > > > > diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c > > index 4595962..b080f94 100644 > > --- a/drivers/net/tg3.c > > +++ b/drivers/net/tg3.c > > @@ -2237,8 +2237,8 @@ static int tg3_set_power_state(struct > > tg3 *tp, pci_power_t state) > > phyid = phydev->drv->phy_id & > > phydev->drv->phy_id_mask; > > if (phyid != TG3_PHY_ID_BCMAC131) { > > phyid &= TG3_PHY_OUI_MASK; > > - if (phyid == TG3_PHY_OUI_1 && > > - phyid == TG3_PHY_OUI_2 && > > + if (phyid == TG3_PHY_OUI_1 || > > + phyid == TG3_PHY_OUI_2 || > > phyid == TG3_PHY_OUI_3) > > do_low_power = true; > > } > > > > > > Thanks, this looks good to me, but I need Matt to ACK this patch. Yes. This is correct. Acked-by: Matt Carlson