| From 21155065d6a30fab6afe3dad66dc920880d8bb66 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 8 Jan 2023 20:37:53 +0100 |
| Subject: Revert "r8169: disable detection of chip version 36" |
| |
| From: Heiner Kallweit <hkallweit1@gmail.com> |
| |
| [ Upstream commit 2ea26b4de6f42b74a5f1701de41efa6bc9f12666 ] |
| |
| This reverts commit 42666b2c452ce87894786aae05e3fad3cfc6cb59. |
| |
| This chip version seems to be very rare, but it exits in consumer |
| devices, see linked report. |
| |
| Link: https://stackoverflow.com/questions/75049473/cant-setup-a-wired-network-in-archlinux-fresh-install |
| Fixes: 42666b2c452c ("r8169: disable detection of chip version 36") |
| Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> |
| Link: https://lore.kernel.org/r/42e9674c-d5d0-a65a-f578-e5c74f244739@gmail.com |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/realtek/r8169_main.c | 5 +---- |
| 1 file changed, 1 insertion(+), 4 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c |
| index a73d061d9fcb..fe8dc8e0522b 100644 |
| --- a/drivers/net/ethernet/realtek/r8169_main.c |
| +++ b/drivers/net/ethernet/realtek/r8169_main.c |
| @@ -1996,10 +1996,7 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii) |
| |
| /* 8168F family. */ |
| { 0x7c8, 0x488, RTL_GIGA_MAC_VER_38 }, |
| - /* It seems this chip version never made it to |
| - * the wild. Let's disable detection. |
| - * { 0x7cf, 0x481, RTL_GIGA_MAC_VER_36 }, |
| - */ |
| + { 0x7cf, 0x481, RTL_GIGA_MAC_VER_36 }, |
| { 0x7cf, 0x480, RTL_GIGA_MAC_VER_35 }, |
| |
| /* 8168E family. */ |
| -- |
| 2.35.1 |
| |
