Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7ec70be authored by Tushar Dave's avatar Tushar Dave Committed by Peter P Waskiewicz Jr
Browse files

e1000e: NIC goes up and immediately goes down 



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: default avatarFabio Futigami <ffutigam@redhat.com>
Signed-off-by: default avatarTushar Dave <tushar.n.dave@intel.com>
CC: Marcelo Ricardo Leitner <mleitner@redhat.com>
CC: stable <stable@vger.kernel.org> [2.6.38+]
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
parent 5d299f3d

drivers/net/ethernet/intel/e1000e/82571.c

+1 −3
Original line number Diff line number Diff line
@@ -1601,10 +1601,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));