Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Sun, 30 Sep 2018 11:06:39 -0400
From:   "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Subject: [PATCH net v2] r8169: always autoneg on resume
To:     netdev@vger.kernel.org
Cc:     hkallweit1@gmail.com, nic_swsd@realtek.com, davem@davemloft.net,
        linux-kernel@vger.kernel.org
User-Agent: astroid/0.13.0 (https://github.com/astroidmail/astroid)
Message-Id: <1538319728.z22jaatdgh.astroid@alex-desktop.none>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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>
---
 drivers/net/ethernet/realtek/r8169.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/re=
altek/r8169.c
index ab30aaeac6d3..db2f347c1463 100644
--- 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)
=20
 	genphy_soft_reset(dev->phydev);
=20
-	/* 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 =3D=3D RTL_GIGA_MAC_VER_33 &&
-	    dev->phydev->autoneg =3D=3D AUTONEG_ENABLE)
+	if (dev->phydev->autoneg =3D=3D AUTONEG_ENABLE)
 		phy_restart_aneg(dev->phydev);
 }
=20
--=20
2.19.0
=