tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

TG3: &&/|| confusion

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@gmail.com>
Acked-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Roel Kluin and committed by
David S. Miller f72b5349 858671f8

+2 -2
unified split
+2 -2
drivers/net/tg3.c
··· 2237 2237 phyid = phydev->drv->phy_id & phydev->drv->phy_id_mask; 2238 2238 if (phyid != TG3_PHY_ID_BCMAC131) { 2239 2239 phyid &= TG3_PHY_OUI_MASK; 2240 - if (phyid == TG3_PHY_OUI_1 && 2241 - phyid == TG3_PHY_OUI_2 && 2240 + if (phyid == TG3_PHY_OUI_1 || 2241 + phyid == TG3_PHY_OUI_2 || 2242 2242 phyid == TG3_PHY_OUI_3) 2243 2243 do_low_power = true; 2244 2244 }