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

Commit 9003b369 authored by Alex Xu (Hello71)'s avatar Alex Xu (Hello71) Committed by David S. Miller
Browse files

r8169: always autoneg on resume 



This affects at least versions 25 and 33, so assume all cards are broken
and just renegotiate by default.

Fixes: 10bc6a60 ("r8169: fix autoneg issue on resume with RTL8168E")
Signed-off-by: default avatarAlex Xu (Hello71) <alex_y_xu@yahoo.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 64199fc0

drivers/net/ethernet/realtek/r8169.c

+3 −4
Original line number Diff line number Diff line
@@ -4072,13 +4072,12 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp) 


	genphy_soft_reset(dev->phydev);



	/* It was reported that chip version 33 ends up with 10MBit/Half on a

	/* It was reported that several chips end up with 10MBit/Half on a

	 * 1GBit link after resuming from S3. For whatever reason the PHY on

	 * this chip doesn't properly start a renegotiation when soft-reset.

	 * these chips doesn't properly start a renegotiation when soft-reset.

	 * Explicitly requesting a renegotiation fixes this.

	 */

	if (tp->mac_version == RTL_GIGA_MAC_VER_33 &&

	    dev->phydev->autoneg == AUTONEG_ENABLE)

	if (dev->phydev->autoneg == AUTONEG_ENABLE)

		phy_restart_aneg(dev->phydev);

}