summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2019-04-28 19:45:28 +0200
committerDavid S. Miller <davem@davemloft.net>2019-04-30 23:28:40 -0400
commit2b5bc3c8ebce3b30676fb9bc30cf52d0a65640f9 (patch)
treeeb7b55331e3f42a2131efc5ac91523eab9f9917c
parent58908dc5d4123a073b396babb3396820f2d61843 (diff)
downloadlinux-2b5bc3c8ebce3b30676fb9bc30cf52d0a65640f9.tar.gz
linux-2b5bc3c8ebce3b30676fb9bc30cf52d0a65640f9.tar.bz2
linux-2b5bc3c8ebce3b30676fb9bc30cf52d0a65640f9.zip
r8169: remove manual autoneg restart workaround
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>
-rw-r--r--drivers/net/ethernet/realtek/r8169.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 3a8931e29da2..122b9bf9dc70 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -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)