[PATCH net-next] netlink: specs: ethtool: Remove UAPI duplication of phy-upstream enum

[PATCH net-next] netlink: specs: ethtool: Remove UAPI duplication of phy-upstream enum

[Kory Maincent]

The phy-upstream enum is already defined in the ethtool.h UAPI header
and used by the ethtool userspace tool. However, the ethtool spec does
not reference it, causing YNL to auto-generate a duplicate and redundant
enum.

Fix this by updating the spec to reference the existing UAPI enum
in ethtool.h.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
Not sure if it should be sent as a fix as there is no real issue here.
---
 Documentation/netlink/specs/ethtool.yaml       | 4 +++-
 include/uapi/linux/ethtool_netlink_generated.h | 5 -----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Documentation/netlink/specs/ethtool.yaml b/Documentation/netlink/specs/ethtool.yaml
index 655d8d10fe24..c650cd3dcb80 100644
--- a/Documentation/netlink/specs/ethtool.yaml
+++ b/Documentation/netlink/specs/ethtool.yaml
@@ -89,8 +89,10 @@ definitions:
           doc: Group of short_detected states
   -
     name: phy-upstream-type
-    enum-name:
+    enum-name: phy-upstream
+    header: linux/ethtool.h
     type: enum
+    name-prefix: phy-upstream
     entries: [ mac, phy ]
   -
     name: tcp-data-split
diff --git a/include/uapi/linux/ethtool_netlink_generated.h b/include/uapi/linux/ethtool_netlink_generated.h
index fe24c3459ac0..30c8dad6214e 100644
--- a/include/uapi/linux/ethtool_netlink_generated.h
+++ b/include/uapi/linux/ethtool_netlink_generated.h
@@ -31,11 +31,6 @@ enum ethtool_header_flags {
 	ETHTOOL_FLAG_STATS = 4,
 };
 
-enum {
-	ETHTOOL_PHY_UPSTREAM_TYPE_MAC,
-	ETHTOOL_PHY_UPSTREAM_TYPE_PHY,
-};
-
 enum ethtool_tcp_data_split {
 	ETHTOOL_TCP_DATA_SPLIT_UNKNOWN,
 	ETHTOOL_TCP_DATA_SPLIT_DISABLED,
-- 
2.34.1

Re: [PATCH net-next] netlink: specs: ethtool: Remove UAPI duplication of phy-upstream enum

[Jakub Kicinski]

On Fri, 25 Apr 2025 19:14:18 +0200 Kory Maincent wrote:
> The phy-upstream enum is already defined in the ethtool.h UAPI header
> and used by the ethtool userspace tool. However, the ethtool spec does
> not reference it, causing YNL to auto-generate a duplicate and redundant
> enum.
> 
> Fix this by updating the spec to reference the existing UAPI enum
> in ethtool.h.
> 
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
> Not sure if it should be sent as a fix as there is no real issue here.

Indeed, but better deliver it to users ASAP otherwise some app 
may start using this unnecessary enum.

Re: [PATCH net-next] netlink: specs: ethtool: Remove UAPI duplication of phy-upstream enum

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Fri, 25 Apr 2025 19:14:18 +0200 you wrote:
> The phy-upstream enum is already defined in the ethtool.h UAPI header
> and used by the ethtool userspace tool. However, the ethtool spec does
> not reference it, causing YNL to auto-generate a duplicate and redundant
> enum.
> 
> Fix this by updating the spec to reference the existing UAPI enum
> in ethtool.h.
> 
> [...]

Here is the summary with links:
  - [net-next] netlink: specs: ethtool: Remove UAPI duplication of phy-upstream enum
    https://git.kernel.org/netdev/net/c/10c34b7d71a4

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html