Commit f72b5349 authored by Roel Kluin's avatar Roel Kluin Committed by David S. Miller
Browse files

TG3: &&/|| confusion 



phyid Can't be both TG3_PHY_OUI_1 and TG3_PHY_OUI_2 and TG3_PHY_OUI_3.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Acked-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 858671f8

drivers/net/tg3.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

			}