aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2010-06-17 14:59:06 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-23 15:58:39 -0400
commitf2e2b3abe4f491130cfda814a8547783b08f10c2 (patch)
treecf5c729236d3c0c36371690e88eaf74f0b491259
parent0c6bdb3084d015221270b418190b630553a38cf8 (diff)
e1000e: do not touch PHY page 800 registers when link speed is 1000Mbps
The PHY on 82577/82578 has issues when the registers on page 800 are accessed when in gigabit mode. Do not clear the Wakeup Control register when resetting the part since it is on page 800 (and will be cleared on reset anyway). Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/e1000e/netdev.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 2a71889112b6..aa14976c8221 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -3184,8 +3184,6 @@ void e1000e_reset(struct e1000_adapter *adapter)
3184 e1000_get_hw_control(adapter); 3184 e1000_get_hw_control(adapter);
3185 3185
3186 ew32(WUC, 0); 3186 ew32(WUC, 0);
3187 if (adapter->flags2 & FLAG2_HAS_PHY_WAKEUP)
3188 e1e_wphy(&adapter->hw, BM_WUC, 0);
3189 3187
3190 if (mac->ops.init_hw(hw)) 3188 if (mac->ops.init_hw(hw))
3191 e_err("Hardware Error\n"); 3189 e_err("Hardware Error\n");