Commit c6d732c3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

net: ethtool: remove duplicate defines for family info 



Commit under fixes switched to uAPI generation from the YAML
spec. A number of custom defines were left behind, mostly
for commands very hard to express in YAML spec.

Among what was left behind was the name and version of
the generic netlink family. Problem is that the codegen
always outputs those values so we ended up with a duplicated,
differently named set of defines.

Provide naming info in YAML and remove the incorrect defines.

Fixes: 8d0580c6 ("ethtool: regenerate uapi header from the spec")
Acked-by: default avatarStanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20250617202240.811179-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d0fa5989

Documentation/netlink/specs/ethtool.yaml

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ protocol: genetlink-legacy 
doc: Partial family for Ethtool Netlink.

uapi-header: linux/ethtool_netlink_generated.h



c-family-name: ethtool-genl-name

c-version-name: ethtool-genl-version



definitions:

  -

    name: udp-tunnel-type

include/uapi/linux/ethtool_netlink.h

+0 −4
Original line number Diff line number Diff line
@@ -208,10 +208,6 @@ enum { 
	ETHTOOL_A_STATS_PHY_MAX = (__ETHTOOL_A_STATS_PHY_CNT - 1)

};



/* generic netlink info */

#define ETHTOOL_GENL_NAME "ethtool"

#define ETHTOOL_GENL_VERSION 1



#define ETHTOOL_MCGRP_MONITOR_NAME "monitor"



#endif /* _UAPI_LINUX_ETHTOOL_NETLINK_H_ */

include/uapi/linux/ethtool_netlink_generated.h

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
#ifndef _UAPI_LINUX_ETHTOOL_NETLINK_GENERATED_H

#define _UAPI_LINUX_ETHTOOL_NETLINK_GENERATED_H



#define ETHTOOL_FAMILY_NAME	"ethtool"

#define ETHTOOL_FAMILY_VERSION	1

#define ETHTOOL_GENL_NAME	"ethtool"

#define ETHTOOL_GENL_VERSION	1



enum {

	ETHTOOL_UDP_TUNNEL_TYPE_VXLAN,