git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
e1000e: reset the PHY on 82577/82578 when going to Sx
[safe/jmp/linux-2.6]
/
drivers
/
net
/
e1000e
/
ich8lan.c
diff --git
a/drivers/net/e1000e/ich8lan.c
b/drivers/net/e1000e/ich8lan.c
index
99df2ab
..
aa0ab0e
100644
(file)
--- a/
drivers/net/e1000e/ich8lan.c
+++ b/
drivers/net/e1000e/ich8lan.c
@@
-2843,9
+2843,8
@@
void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw)
E1000_PHY_CTRL_GBE_DISABLE;
ew32(PHY_CTRL, phy_ctrl);
- /* Workaround SWFLAG unexpectedly set during S0->Sx */
if (hw->mac.type == e1000_pchlan)
-
udelay(500
);
+
e1000_phy_hw_reset_ich8lan(hw
);
default:
break;
}