[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <C27F8246C663564A84BB7AB343977242163420407C@IRVEXCHCCR01.corp.ad.broadcom.com>
Date: Mon, 16 Feb 2009 09:27:19 -0800
From: "Michael Chan" <mchan@...adcom.com>
To: "'Roel Kluin'" <roel.kluin@...il.com>
cc: "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
"Andrew Morton" <akpm@...ux-foundation.org>,
"Matthew Carlson" <mcarlson@...adcom.com>
Subject: Re: [PATCH] TG3: &&/|| confusion
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 <roel.kluin@...il.com>
> ---
> // 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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists