Commit 818f3331 authored Nov 19, 2009 by Bruce Allan Committed by David S. Miller Nov 20, 2009

e1000e: do not initiate autonegotiation during OEM configuration



When configuring the OEM bits in the PHY on 82577/82578, do not restart
autonegotiation if the firmware is blocking it (e.g. when an IDE-R session
is active) because the link must not go down.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 189983d4

drivers/net/e1000e/ich8lan.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1118,6 +1118,7 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state)
		oem_reg \|= HV_OEM_BITS_LPLU;
		}
		/* Restart auto-neg to activate the bits */
		if (!e1000_check_reset_block(hw))
		oem_reg \|= HV_OEM_BITS_RESTART_AN;
		ret_val = hw->phy.ops.write_phy_reg_locked(hw, HV_OEM_BITS, oem_reg);