netdev - Re: [PATCH net-next 3/5] r8169: remove support for chip version 49

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <51de30fe-4066-1d11-75d9-d7cfda860442@gmail.com>
Date:   Tue, 23 Aug 2022 12:58:59 +0200
From:   Heiner Kallweit <hkallweit1@...il.com>
To:     Paolo Abeni <pabeni@...hat.com>, Jakub Kicinski <kuba@...nel.org>,
        David Miller <davem@...emloft.net>,
        Realtek linux nic maintainers <nic_swsd@...ltek.com>
Cc:     "netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: Re: [PATCH net-next 3/5] r8169: remove support for chip version 49

On 23.08.2022 12:16, Paolo Abeni wrote:
> On Sat, 2022-08-20 at 15:53 +0200, Heiner Kallweit wrote:
>> Detection of this chip version has been disabled for few kernel versions now.
>> Nobody complained, so remove support for this chip version.
>>
>> Signed-off-by: Heiner Kallweit <hkallweit1@...il.com>
>> ---
>>  drivers/net/ethernet/realtek/r8169.h          |  2 +-
>>  drivers/net/ethernet/realtek/r8169_main.c     | 26 ++-----------------
>>  .../net/ethernet/realtek/r8169_phy_config.c   | 22 ----------------
>>  3 files changed, 3 insertions(+), 47 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/realtek/r8169.h b/drivers/net/ethernet/realtek/r8169.h
>> index a66b10850..7c85c4696 100644
>> --- a/drivers/net/ethernet/realtek/r8169.h
>> +++ b/drivers/net/ethernet/realtek/r8169.h
>> @@ -59,7 +59,7 @@ enum mac_version {
>>  	RTL_GIGA_MAC_VER_46,
>>  	/* support for RTL_GIGA_MAC_VER_47 has been removed */
>>  	RTL_GIGA_MAC_VER_48,
>> -	RTL_GIGA_MAC_VER_49,
>> +	/* support for RTL_GIGA_MAC_VER_49 has been removed */
>>  	RTL_GIGA_MAC_VER_50,
>>  	RTL_GIGA_MAC_VER_51,
>>  	RTL_GIGA_MAC_VER_52,
>> diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
>> index 0e7d10cd6..b22b80aab 100644
>> --- a/drivers/net/ethernet/realtek/r8169_main.c
>> +++ b/drivers/net/ethernet/realtek/r8169_main.c
>> @@ -134,7 +134,6 @@ static const struct {
>>  	[RTL_GIGA_MAC_VER_44] = {"RTL8411b",		FIRMWARE_8411_2 },
>>  	[RTL_GIGA_MAC_VER_46] = {"RTL8168h/8111h",	FIRMWARE_8168H_2},
>>  	[RTL_GIGA_MAC_VER_48] = {"RTL8107e",		FIRMWARE_8107E_2},
>> -	[RTL_GIGA_MAC_VER_49] = {"RTL8168ep/8111ep"			},
>>  	[RTL_GIGA_MAC_VER_50] = {"RTL8168ep/8111ep"			},
>>  	[RTL_GIGA_MAC_VER_51] = {"RTL8168ep/8111ep"			},
>>  	[RTL_GIGA_MAC_VER_52] = {"RTL8168fp/RTL8117",  FIRMWARE_8168FP_3},
>> @@ -885,7 +884,6 @@ static void rtl8168g_phy_suspend_quirk(struct rtl8169_private *tp, int value)
>>  {
>>  	switch (tp->mac_version) {
>>  	case RTL_GIGA_MAC_VER_40:
>> -	case RTL_GIGA_MAC_VER_49:
>>  		if (value & BMCR_RESET || !(value & BMCR_PDOWN))
>>  			rtl_eri_set_bits(tp, 0x1a8, 0xfc000000);
>>  		else
>> @@ -1199,7 +1197,7 @@ static enum rtl_dash_type rtl_check_dash(struct rtl8169_private *tp)
>>  	case RTL_GIGA_MAC_VER_28:
>>  	case RTL_GIGA_MAC_VER_31:
>>  		return r8168dp_check_dash(tp) ? RTL_DASH_DP : RTL_DASH_NONE;
>> -	case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_53:
>> +	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_53:
> 
> The above chunk looks incorrect. I think should be:
> 	case RTL_GIGA_MAC_VER_50 ... RTL_GIGA_MAC_VER_53:
> 
Indeed, thanks for spotting this typo!

> instead.
> 
> Thanks!
> 
> Paolo
>