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: 10bc6a6042c9 ("r8169: fix autoneg issue on resume with RTL8168E")
Signed-off-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index a94b874982dca404d722910b57f4430c1faee2bf..9a5e2969df6197cd3383e263b2336dca5faa1a2d 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -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);
 }