You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
This commit is contained in:
+2
-2
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user