| Message ID | 2cd3df01-5f8b-08dd-6def-3f31a3014bde@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4e9c91cf92ec3acee94e04425594aa3688a225e8 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] r8169: disable detection of chip version 60 | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 24 Nov 2021 21:44:40 +0100 you wrote: > It seems only XID 609 made it to the mass market. Therefore let's > disable detection of the other RTL8125a XID's. If nobody complains > we can remove support for RTL_GIGA_MAC_VER_60 later. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > drivers/net/ethernet/realtek/r8169_main.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) Here is the summary with links: - [net-next] r8169: disable detection of chip version 60 https://git.kernel.org/netdev/net-next/c/4e9c91cf92ec You are awesome, thank you!
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index e9b560051..76a029860 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -1969,8 +1969,11 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii) { 0x7cf, 0x641, RTL_GIGA_MAC_VER_63 }, /* 8125A family. */ - { 0x7cf, 0x608, RTL_GIGA_MAC_VER_60 }, - { 0x7c8, 0x608, RTL_GIGA_MAC_VER_61 }, + { 0x7cf, 0x609, RTL_GIGA_MAC_VER_61 }, + /* It seems only XID 609 made it to the mass market. + * { 0x7cf, 0x608, RTL_GIGA_MAC_VER_60 }, + * { 0x7c8, 0x608, RTL_GIGA_MAC_VER_61 }, + */ /* RTL8117 */ { 0x7cf, 0x54b, RTL_GIGA_MAC_VER_53 },
It seems only XID 609 made it to the mass market. Therefore let's disable detection of the other RTL8125a XID's. If nobody complains we can remove support for RTL_GIGA_MAC_VER_60 later. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/net/ethernet/realtek/r8169_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)