diff options
| author | Tushar Dave <tushar.n.dave@intel.com> | 2012-07-31 02:02:43 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-15 12:04:30 -0700 |
| commit | 5a4cebe94b76a0182a8ebb97b665ff84e7427482 (patch) | |
| tree | 59d098069f3a185d1d85fa944abe9e43ff42b2df /drivers/net/e1000e | |
| parent | 4f5a5866aa4dccf42b2fa1cdecf372025a3e86cc (diff) | |
| download | kernel_samsung_smdk4412-5a4cebe94b76a0182a8ebb97b665ff84e7427482.zip kernel_samsung_smdk4412-5a4cebe94b76a0182a8ebb97b665ff84e7427482.tar.gz kernel_samsung_smdk4412-5a4cebe94b76a0182a8ebb97b665ff84e7427482.tar.bz2 | |
e1000e: NIC goes up and immediately goes down
commit b7ec70be01a87f2c85df3ae11046e74f9b67e323 upstream.
Found that commit d478eb44 was a bad commit.
If the link partner is transmitting codeword (even if NULL codeword),
then the RXCW.C bit will be set so check for RXCW.CW is unnecessary.
Ref: RH BZ 840642
Reported-by: Fabio Futigami <ffutigam@redhat.com>
Signed-off-by: Tushar Dave <tushar.n.dave@intel.com>
CC: Marcelo Ricardo Leitner <mleitner@redhat.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/e1000e')
| -rw-r--r-- | drivers/net/e1000e/82571.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c index 5278e84..0d0ee55 100644 --- a/drivers/net/e1000e/82571.c +++ b/drivers/net/e1000e/82571.c @@ -1602,10 +1602,8 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw) * auto-negotiation in the TXCW register and disable * forced link in the Device Control register in an * attempt to auto-negotiate with our link partner. - * If the partner code word is null, stop forcing - * and restart auto negotiation. */ - if ((rxcw & E1000_RXCW_C) || !(rxcw & E1000_RXCW_CW)) { + if (rxcw & E1000_RXCW_C) { /* Enable autoneg, and unforce link up */ ew32(TXCW, mac->txcw); ew32(CTRL, (ctrl & ~E1000_CTRL_SLU)); |