From ccfa908ad3f5d723db2e002b7450695f168cdc3a Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Wed, 8 Apr 2026 09:59:24 +0200 Subject: [PATCH] ethtool: drop rss-input-xfrm compatibility patch The rss-input-xfrm workaround for Linux 6.6 is no longer needed with current kernel versions. Remove the patch and the associated --enable-rss-input-xfrm configure flag. Link: https://github.com/openwrt/openwrt/pull/22841 Signed-off-by: Nick Hainke --- package/network/utils/ethtool/Makefile | 5 +- ...building-for-RSS-input-xfrm-optional.patch | 72 ------------------- 2 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 package/network/utils/ethtool/patches/0001-ethtool-make-building-for-RSS-input-xfrm-optional.patch diff --git a/package/network/utils/ethtool/Makefile b/package/network/utils/ethtool/Makefile index 77545ca246a..9c90cc88251 100644 --- a/package/network/utils/ethtool/Makefile +++ b/package/network/utils/ethtool/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ethtool PKG_VERSION:=6.19 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Felix Fietkau PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -61,9 +61,6 @@ else CONFIGURE_ARGS += --disable-netlink --disable-pretty-dump endif -# enable support for input_xfrm with kernels newer than 6.6 -CONFIGURE_ARGS += --enable-rss-input-xfrm - define Package/ethtool/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/ethtool $(1)/usr/sbin diff --git a/package/network/utils/ethtool/patches/0001-ethtool-make-building-for-RSS-input-xfrm-optional.patch b/package/network/utils/ethtool/patches/0001-ethtool-make-building-for-RSS-input-xfrm-optional.patch deleted file mode 100644 index 814e703265c..00000000000 --- a/package/network/utils/ethtool/patches/0001-ethtool-make-building-for-RSS-input-xfrm-optional.patch +++ /dev/null @@ -1,72 +0,0 @@ -From c88eb6f4e9b2d8f71f3391db2bf0ec82ecccae81 Mon Sep 17 00:00:00 2001 -From: Daniel Golle -Date: Wed, 12 Feb 2025 04:12:42 +0000 -Subject: [PATCH] ethtool: make building for RSS input xfrm optional - -Unfortunately there is no way to detect at runtime if the kernel the -support for RSS input transformation, and the default value -RXH_XFRM_NO_CHANGE (0xff) used by newer ethtool results in breakage -with older kernels. -As a stop-gap solution simply don't compile with support for input -xfrm by default. - -Signed-off-by: Daniel Golle ---- - configure.ac | 10 ++++++++++ - ethtool.c | 10 ++++++++++ - 2 files changed, 20 insertions(+) - ---- a/configure.ac -+++ b/configure.ac -@@ -45,6 +45,16 @@ if test x$enable_pretty_dump = xyes; the - fi - AM_CONDITIONAL([ETHTOOL_ENABLE_PRETTY_DUMP], [test x$enable_pretty_dump = xyes]) - -+AC_ARG_ENABLE(rss-input-xfrm, -+ [ --enable-rss-input-xfrm build with support for RSS input transformation (disabled by default)], -+ , -+ enable_rss_input_xfrm=no) -+if test x$enable_rss_input_xfrm = xyes; then -+ AC_DEFINE(ETHTOOL_ENABLE_RSS_INPUT_XFRM, 1, -+ [Define this to enable building with support for RSS input transformation.]) -+fi -+AM_CONDITIONAL([ETHTOOL_ENABLE_RSS_INPUT_XFRM], [test x$enable_rss_input_xfrm = xyes]) -+ - AC_ARG_WITH([bash-completion-dir], - AS_HELP_STRING([--with-bash-completion-dir[=PATH]], - [Install the bash-completion script in this directory. @<:@default=yes@:>@]), ---- a/ethtool.c -+++ b/ethtool.c -@@ -4176,7 +4176,7 @@ static int do_grxfh(struct cmd_context * - } - if (rss->hfunc) - printf(" Unknown hash function: 0x%x\n", rss->hfunc); -- -+#ifdef ETHTOOL_ENABLE_RSS_INPUT_XFRM - printf("RSS input transformation:\n"); - printf(" symmetric-xor: %s\n", - (rss->input_xfrm & RXH_XFRM_SYM_XOR) ? "on" : "off"); -@@ -4188,6 +4188,7 @@ static int do_grxfh(struct cmd_context * - if (rss->input_xfrm) - printf(" Unknown bits in RSS input transformation: 0x%x\n", - rss->input_xfrm); -+#endif - - out: - free(hfuncs); -@@ -4509,7 +4510,15 @@ static int do_srxfh(struct cmd_context * - rss->cmd = ETHTOOL_SRSSH; - rss->rss_context = rss_context; - rss->hfunc = req_hfunc; -+#ifdef ETHTOOL_ENABLE_RSS_INPUT_XFRM - rss->input_xfrm = req_input_xfrm; -+#else -+ if (req_input_xfrm != 0xff) { -+ perror("Compiled for kernel without support for input transformation"); -+ err = 1; -+ goto free; -+ } -+#endif - if (delete) { - rss->indir_size = rss->key_size = 0; - } else { -- 2.47.3