Commit ebda123f authored by Kees Cook's avatar Kees Cook Committed by Jakub Kicinski
Browse files

Revert "UAPI: ethtool: Use __struct_group() in struct ethtool_link_settings" 



This reverts commit 43d34870. We cannot
use tagged struct groups in UAPI because C++ will throw syntax errors
even under "extern C".

Signed-off-by: default avatarKees Cook <kees@kernel.org>
Link: https://patch.msgid.link/20241115204308.3821419-2-kees@kernel.org


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

include/uapi/linux/ethtool.h

+15 −18
Original line number Diff line number Diff line
@@ -2511,8 +2511,6 @@ enum ethtool_reset_flags { 
 *	autonegotiation; 0 if unknown or not applicable.  Read-only.

 */

struct ethtool_link_settings {

	/* New members MUST be added within the __struct_group() macro below. */

	__struct_group(ethtool_link_settings_hdr, hdr, /* no attrs */,

	__u32	cmd;

	__u32	speed;

	__u8	duplex;
@@ -2528,7 +2526,6 @@ struct ethtool_link_settings { 
	__u8	master_slave_state;

	__u8	rate_matching;

	__u32	reserved[7];

	);

	__u32	link_mode_masks[];

	/* layout of link_mode_masks fields:

	 * __u32 map_supported[link_mode_masks_nwords];