]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
e1000e: do not touch PHY page 800 registers when link speed is 1000Mbps
authorBruce Allan <bruce.w.allan@intel.com>
Thu, 17 Jun 2010 18:59:06 +0000 (18:59 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 Jun 2010 19:58:39 +0000 (12:58 -0700)
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>
drivers/net/e1000e/netdev.c

index 2a71889112b651989417115433bea5cb594cde63..aa14976c82212da93c05f6a4f5c9cdc833f5fa15 100644 (file)
@@ -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");