summaryrefslogtreecommitdiff
path: root/net/ethtool/ioctl.c
diff options
context:
space:
mode:
authorKees Cook <kees@kernel.org>2024-11-15 12:43:03 -0800
committerJakub Kicinski <kuba@kernel.org>2024-11-18 18:52:11 -0800
commit1cfb5e57886aa69a992ff0ebd32e4651eb0fc995 (patch)
treed9d9f9e34b549e8d5e0625589355868be2bc5d92 /net/ethtool/ioctl.c
parent920efe3e13f7eb5711d4ad8ecc0cced16b1a84cf (diff)
downloadlinux-next-1cfb5e57886aa69a992ff0ebd32e4651eb0fc995.tar.gz
linux-next-1cfb5e57886aa69a992ff0ebd32e4651eb0fc995.zip
Revert "net: ethtool: Avoid thousands of -Wflex-array-member-not-at-end warnings"
This reverts commit 3bd9b9abdf1563a22041b7255baea6d449902f1a. We cannot use the new tagged struct group because it throws C++ errors even under "extern C". Signed-off-by: Kees Cook <kees@kernel.org> Link: https://patch.msgid.link/20241115204308.3821419-1-kees@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ethtool/ioctl.c')
-rw-r--r--net/ethtool/ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index d86399bcf223..61df8ce44379 100644
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -425,7 +425,7 @@ convert_link_ksettings_to_legacy_settings(
/* layout of the struct passed from/to userland */
struct ethtool_link_usettings {
- struct ethtool_link_settings_hdr base;
+ struct ethtool_link_settings base;
struct {
__u32 supported[__ETHTOOL_LINK_MODE_MASK_NU32];
__u32 advertising[__ETHTOOL_LINK_MODE_MASK_NU32];