diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2010-06-17 18:59:06 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-23 12:58:39 -0700 |
| commit | f2e2b3abe4f491130cfda814a8547783b08f10c2 (patch) | |
| tree | cf5c729236d3c0c36371690e88eaf74f0b491259 /drivers/net/e1000e | |
| parent | 0c6bdb3084d015221270b418190b630553a38cf8 (diff) | |
| download | talos-obmc-linux-f2e2b3abe4f491130cfda814a8547783b08f10c2.tar.gz talos-obmc-linux-f2e2b3abe4f491130cfda814a8547783b08f10c2.zip | |
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>
Diffstat (limited to 'drivers/net/e1000e')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 2 |
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) e1000_get_hw_control(adapter); ew32(WUC, 0); - if (adapter->flags2 & FLAG2_HAS_PHY_WAKEUP) - e1e_wphy(&adapter->hw, BM_WUC, 0); if (mac->ops.init_hw(hw)) e_err("Hardware Error\n"); |
