[PATCH net-next] ethtool: remove XCVR_DUMMY entries

[PATCH net-next] ethtool: remove XCVR_DUMMY entries

[Heiner Kallweit]

The transceiver dummy entries are not used any longer, so remove them.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 include/uapi/linux/ethtool.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index d586ee5e1..77721ea36 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -1673,9 +1673,6 @@ static inline int ethtool_validate_duplex(__u8 duplex)
 /* Which transceiver to use. */
 #define XCVR_INTERNAL		0x00 /* PHY and MAC are in the same package */
 #define XCVR_EXTERNAL		0x01 /* PHY and MAC are in different packages */
-#define XCVR_DUMMY1		0x02
-#define XCVR_DUMMY2		0x03
-#define XCVR_DUMMY3		0x04
 
 /* Enable or disable autonegotiation. */
 #define AUTONEG_DISABLE		0x00
-- 
2.25.2

Re: [PATCH net-next] ethtool: remove XCVR_DUMMY entries

[Andrew Lunn]

On Sun, Mar 22, 2020 at 02:14:20PM +0100, Heiner Kallweit wrote:
> The transceiver dummy entries are not used any longer, so remove them.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
>  include/uapi/linux/ethtool.h | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
> index d586ee5e1..77721ea36 100644
> --- a/include/uapi/linux/ethtool.h
> +++ b/include/uapi/linux/ethtool.h
> @@ -1673,9 +1673,6 @@ static inline int ethtool_validate_duplex(__u8 duplex)
>  /* Which transceiver to use. */
>  #define XCVR_INTERNAL		0x00 /* PHY and MAC are in the same package */
>  #define XCVR_EXTERNAL		0x01 /* PHY and MAC are in different packages */
> -#define XCVR_DUMMY1		0x02
> -#define XCVR_DUMMY2		0x03
> -#define XCVR_DUMMY3		0x04

Hi Heiner

We need to be careful here. This is a UAPI header. The kernel might
not use them, but is there any user space code using them?

A quick search found:

http://www.infradead.org/~tgr/libnl/doc/api/ethtool_8c_source.html

	Andrew

Re: [PATCH net-next] ethtool: remove XCVR_DUMMY entries

[Heiner Kallweit]

On 22.03.2020 15:08, Andrew Lunn wrote:
> On Sun, Mar 22, 2020 at 02:14:20PM +0100, Heiner Kallweit wrote:
>> The transceiver dummy entries are not used any longer, so remove them.
>>
>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
>> ---
>>  include/uapi/linux/ethtool.h | 3 ---
>>  1 file changed, 3 deletions(-)
>>
>> diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
>> index d586ee5e1..77721ea36 100644
>> --- a/include/uapi/linux/ethtool.h
>> +++ b/include/uapi/linux/ethtool.h
>> @@ -1673,9 +1673,6 @@ static inline int ethtool_validate_duplex(__u8 duplex)
>>  /* Which transceiver to use. */
>>  #define XCVR_INTERNAL		0x00 /* PHY and MAC are in the same package */
>>  #define XCVR_EXTERNAL		0x01 /* PHY and MAC are in different packages */
>> -#define XCVR_DUMMY1		0x02
>> -#define XCVR_DUMMY2		0x03
>> -#define XCVR_DUMMY3		0x04
> 
> Hi Heiner
> 
Hi Andrew

> We need to be careful here. This is a UAPI header. The kernel might
> not use them, but is there any user space code using them?
> 
Right. I checked ethtool and it doesn't use the dummy values.
Wherever I checked only the internal/external values are used.

In kernel last usage of the dummy values was removed 2yrs ago,
see e.g. here: https://lore.kernel.org/patchwork/patch/767218/

> A quick search found:
> 
> http://www.infradead.org/~tgr/libnl/doc/api/ethtool_8c_source.html
> 
I checked here http://git.infradead.org/users/tgr/libnl.git and there
hasn't been such an ethtool.c file for ages.

> 	Andrew
> 
Heiner

Re: [PATCH net-next] ethtool: remove XCVR_DUMMY entries

[Michal Kubecek]

On Sun, Mar 22, 2020 at 03:45:22PM +0100, Heiner Kallweit wrote:
> On 22.03.2020 15:08, Andrew Lunn wrote:
> > A quick search found:
> > 
> > http://www.infradead.org/~tgr/libnl/doc/api/ethtool_8c_source.html
> > 
> I checked here http://git.infradead.org/users/tgr/libnl.git and there
> hasn't been such an ethtool.c file for ages.

I doubt it was ever part of the official libnl tree - and it certainly
never was in master branch of libnl git. It rather looks as part of an
old attempt at a netlink interface for ethtool (2010 or 2011, according
to the file banner).

Michal

Re: [PATCH net-next] ethtool: remove XCVR_DUMMY entries

[David Miller]

From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Sun, 22 Mar 2020 14:14:20 +0100

> The transceiver dummy entries are not used any longer, so remove them.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

As this is UAPI we can't do this, as others have said.