OSDN Git Service

r8169: remove manual autoneg restart workaround
authorHeiner Kallweit <hkallweit1@gmail.com>
Sun, 28 Apr 2019 17:45:28 +0000 (19:45 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 1 May 2019 03:28:40 +0000 (23:28 -0400)
According to Neil who reported the issue leading to this
workaround, the workaround is no longer needed since
version 5.0. So let's remove it.

This was the bug report leading to the workaround:
https://bugzilla.kernel.org/show_bug.cgi?id=201081

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Tested-by: Neil MacLeod <neil@nmacleod.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/realtek/r8169.c

index 3a8931e..122b9bf 100644 (file)
@@ -4083,14 +4083,6 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
        phy_speed_up(tp->phydev);
 
        genphy_soft_reset(tp->phydev);
-
-       /* 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
-        * these chips doesn't properly start a renegotiation when soft-reset.
-        * Explicitly requesting a renegotiation fixes this.
-        */
-       if (tp->phydev->autoneg == AUTONEG_ENABLE)
-               phy_restart_aneg(tp->phydev);
 }
 
 static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr)