* [PATCH net-next] r8169: remove support for RTL8100e
@ 2019-10-17 18:59 Heiner Kallweit
2019-10-17 19:11 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Heiner Kallweit @ 2019-10-17 18:59 UTC (permalink / raw)
To: Realtek linux nic maintainers, David Miller; +Cc: netdev
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 <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169_main.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 350b0d949..2feddc26f 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -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,
--
2.23.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] r8169: remove support for RTL8100e
2019-10-17 18:59 [PATCH net-next] r8169: remove support for RTL8100e Heiner Kallweit
@ 2019-10-17 19:11 ` David Miller
2019-10-17 19:26 ` Heiner Kallweit
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2019-10-17 19:11 UTC (permalink / raw)
To: hkallweit1; +Cc: nic_swsd, netdev
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Thu, 17 Oct 2019 20:59:43 +0200
> 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 <hkallweit1@gmail.com>
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] r8169: remove support for RTL8100e
2019-10-17 19:11 ` David Miller
@ 2019-10-17 19:26 ` Heiner Kallweit
2019-10-17 19:40 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Heiner Kallweit @ 2019-10-17 19:26 UTC (permalink / raw)
To: David Miller; +Cc: nic_swsd, netdev
On 17.10.2019 21:11, David Miller wrote:
> From: Heiner Kallweit <hkallweit1@gmail.com>
> Date: Thu, 17 Oct 2019 20:59:43 +0200
>
>> 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 <hkallweit1@gmail.com>
>
> Hmmm... does it really hurt anything to keep them in there?
>
Not really.
> 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] r8169: remove support for RTL8100e
2019-10-17 19:26 ` Heiner Kallweit
@ 2019-10-17 19:40 ` David Miller
2019-10-18 18:31 ` Heiner Kallweit
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2019-10-17 19:40 UTC (permalink / raw)
To: hkallweit1; +Cc: nic_swsd, netdev
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Thu, 17 Oct 2019 21:26:35 +0200
> To be on the safe side, let me check with Realtek directly.
That's a great idea, let us know what you find out.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] r8169: remove support for RTL8100e
2019-10-17 19:40 ` David Miller
@ 2019-10-18 18:31 ` Heiner Kallweit
2019-10-18 18:36 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Heiner Kallweit @ 2019-10-18 18:31 UTC (permalink / raw)
To: David Miller; +Cc: nic_swsd, netdev
On 17.10.2019 21:40, David Miller wrote:
> From: Heiner Kallweit <hkallweit1@gmail.com>
> Date: Thu, 17 Oct 2019 21:26:35 +0200
>
>> 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] r8169: remove support for RTL8100e
2019-10-18 18:31 ` Heiner Kallweit
@ 2019-10-18 18:36 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2019-10-18 18:36 UTC (permalink / raw)
To: hkallweit1; +Cc: nic_swsd, netdev
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Fri, 18 Oct 2019 20:31:28 +0200
> On 17.10.2019 21:40, David Miller wrote:
>> From: Heiner Kallweit <hkallweit1@gmail.com>
>> Date: Thu, 17 Oct 2019 21:26:35 +0200
>>
>>> 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.
Ok, great.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-18 18:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-17 18:59 [PATCH net-next] r8169: remove support for RTL8100e Heiner Kallweit
2019-10-17 19:11 ` David Miller
2019-10-17 19:26 ` Heiner Kallweit
2019-10-17 19:40 ` David Miller
2019-10-18 18:31 ` Heiner Kallweit
2019-10-18 18:36 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.