diff options
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/82571.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c index 0b3bade957fd..2a4ded2fd6e5 100644 --- a/drivers/net/ethernet/intel/e1000e/82571.c +++ b/drivers/net/ethernet/intel/e1000e/82571.c | |||
| @@ -1601,10 +1601,8 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw) | |||
| 1601 | * auto-negotiation in the TXCW register and disable | 1601 | * auto-negotiation in the TXCW register and disable |
| 1602 | * forced link in the Device Control register in an | 1602 | * forced link in the Device Control register in an |
| 1603 | * attempt to auto-negotiate with our link partner. | 1603 | * attempt to auto-negotiate with our link partner. |
| 1604 | * If the partner code word is null, stop forcing | ||
| 1605 | * and restart auto negotiation. | ||
| 1606 | */ | 1604 | */ |
| 1607 | if ((rxcw & E1000_RXCW_C) || !(rxcw & E1000_RXCW_CW)) { | 1605 | if (rxcw & E1000_RXCW_C) { |
| 1608 | /* Enable autoneg, and unforce link up */ | 1606 | /* Enable autoneg, and unforce link up */ |
| 1609 | ew32(TXCW, mac->txcw); | 1607 | ew32(TXCW, mac->txcw); |
| 1610 | ew32(CTRL, (ctrl & ~E1000_CTRL_SLU)); | 1608 | ew32(CTRL, (ctrl & ~E1000_CTRL_SLU)); |