r8169: remove support for RTL8100e
Heiner Kallweit
maintainerPATCH 1/1 r8169: remove support for RTL8100e
It's unclear where these entries came from and also the r8101 vendor driver doesn't mention any such chip type. So let's remove these entries.
--- drivers/net/ethernet/realtek/r8169_main.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +1 -11
@@ -97,8 +97,7 @@ enum mac_version {RTL_GIGA_MAC_VER_11 ,RTL_GIGA_MAC_VER_12 ,RTL_GIGA_MAC_VER_13 , -RTL_GIGA_MAC_VER_14 , -RTL_GIGA_MAC_VER_15 , +/* versions 14 and 15 don't seem to exist */ RTL_GIGA_MAC_VER_16 ,RTL_GIGA_MAC_VER_17 , RTL_GIGA_MAC_VER_18,
@@ -164,8 +163,6 @@ static const struct { [RTL_GIGA_MAC_VER_11] = {"RTL8168b/8111b" }, [RTL_GIGA_MAC_VER_12] = {"RTL8168b/8111b" }, [RTL_GIGA_MAC_VER_13] = {"RTL8101e" }, - [RTL_GIGA_MAC_VER_14] = {"RTL8100e" }, - [RTL_GIGA_MAC_VER_15] = {"RTL8100e" }, [RTL_GIGA_MAC_VER_16] = {"RTL8101e" }, [RTL_GIGA_MAC_VER_17] = {"RTL8168b/8111b" }, [RTL_GIGA_MAC_VER_18] = {"RTL8168cp/8111cp" },
@@ -2188,9 +2185,6 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp) { 0x7c8, 0x348, RTL_GIGA_MAC_VER_09 }, { 0x7c8, 0x248, RTL_GIGA_MAC_VER_09 }, { 0x7c8, 0x340, RTL_GIGA_MAC_VER_16 }, -/* FIXME: where did these entries come from ? -- FR */ - { 0xfc8, 0x388, RTL_GIGA_MAC_VER_15 }, - { 0xfc8, 0x308, RTL_GIGA_MAC_VER_14 },/* 8110 family. */ { 0xfc8, 0x980, RTL_GIGA_MAC_VER_06 },
@@ -3781,8 +3775,6 @@ static void rtl_hw_phy_config(struct net_device *dev) [RTL_GIGA_MAC_VER_11] = rtl8168bb_hw_phy_config, [RTL_GIGA_MAC_VER_12] = rtl8168bef_hw_phy_config, [RTL_GIGA_MAC_VER_13] = NULL, - [RTL_GIGA_MAC_VER_14] = NULL, - [RTL_GIGA_MAC_VER_15] = NULL, [RTL_GIGA_MAC_VER_16] = NULL, [RTL_GIGA_MAC_VER_17] = rtl8168bef_hw_phy_config, [RTL_GIGA_MAC_VER_18] = rtl8168cp_1_hw_phy_config,
@@ -5354,8 +5346,6 @@ static void rtl_hw_config(struct rtl8169_private *tp) [RTL_GIGA_MAC_VER_11] = rtl_hw_start_8168bb, [RTL_GIGA_MAC_VER_12] = rtl_hw_start_8168bef, [RTL_GIGA_MAC_VER_13] = NULL, - [RTL_GIGA_MAC_VER_14] = NULL, - [RTL_GIGA_MAC_VER_15] = NULL, [RTL_GIGA_MAC_VER_16] = NULL, [RTL_GIGA_MAC_VER_17] = rtl_hw_start_8168bef, [RTL_GIGA_MAC_VER_18] = rtl_hw_start_8168cp_1,
Signature · 1 line
2.23.0
David Miller
maintainerFrom: Heiner Kallweit <[email protected]>
Date: Thu, 17 Oct 2019 20:59:43 +0200
Quoted 5 lines
It's unclear where these entries came from and also the r8101 vendor driver doesn't mention any such chip type. So let's remove these entries.
Signed-off-by Heiner Kallweit <[email protected]>
Hmmm... does it really hurt anything to keep them in there?
Maybe we think these chips don't exist, but it would be a real shame to brake someone's setup when we really didn't need to.
Heiner Kallweit
maintainerQuoted 11 lines · David Miller
From: Heiner Kallweit <[email protected]>
Date: Thu, 17 Oct 2019 20:59:43 +0200Quoted 5 lines
It's unclear where these entries came from and also the r8101 vendor driver doesn't mention any such chip type. So let's remove these entries.
Signed-off-by Heiner Kallweit <[email protected]>Hmmm... does it really hurt anything to keep them in there?
Not really.
Quoted 3 lines
Maybe we think these chips don't exist, but it would be a real shame to brake someone's setup when we really didn't need to. Indeed, therefore I did my best to find any sign of life of
such a chip version. But there was none. To be on the safe side, let me check with Realtek directly.
David Miller
maintainerFrom: Heiner Kallweit <[email protected]>
Date: Thu, 17 Oct 2019 21:26:35 +0200
Quoted 1 line
To be on the safe side, let me check with Realtek directly.
That's a great idea, let us know what you find out.
Heiner Kallweit
maintainerQuoted 7 lines · David Miller
From: Heiner Kallweit <[email protected]>
Date: Thu, 17 Oct 2019 21:26:35 +0200Quoted 1 line
To be on the safe side, let me check with Realtek directly.
That's a great idea, let us know what you find out.
Realtek suggested to keep the two chip definitions. Supposedly RTL_GIGA_MAC_VER_15 is the same as RTL_GIGA_MAC_VER_12, and RTL_GIGA_MAC_VER_14 is the same as RTL_GIGA_MAC_VER_11. So let's keep it as it is.
David Miller
maintainerFrom: Heiner Kallweit <[email protected]>
Date: Fri, 18 Oct 2019 20:31:28 +0200
Quoted 12 lines · David Miller
Quoted 7 lines
From: Heiner Kallweit <[email protected]>
Date: Thu, 17 Oct 2019 21:26:35 +0200Quoted 1 line
To be on the safe side, let me check with Realtek directly.
That's a great idea, let us know what you find out.
Realtek suggested to keep the two chip definitions. Supposedly
RTL_GIGA_MAC_VER_15is the same asRTL_GIGA_MAC_VER_12, andRTL_GIGA_MAC_VER_14is the same asRTL_GIGA_MAC_VER_11. So let's keep it as it is.
Ok, great.