From 4e7914f96a6bcadcca49582a0c3e4e57d1e77167 Mon Sep 17 00:00:00 2001 From: John Audia Date: Thu, 11 Sep 2025 15:26:21 -0400 Subject: [PATCH] ethtool: update to 6.15 Version 6.15 - 29-Aug-2025 * netlink: fix missing headers in text output * netlink: fix print_string when the value is NULL Build system: x86/64 Build-tested: x86/64-glibc Run-tested: x86/64-glibc Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/20021 Signed-off-by: Nick Hainke --- package/network/utils/ethtool/Makefile | 4 ++-- ...-ethtool-make-building-for-RSS-input-xfrm-optional.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/network/utils/ethtool/Makefile b/package/network/utils/ethtool/Makefile index aa663b5d60d..991ee293a94 100644 --- a/package/network/utils/ethtool/Makefile +++ b/package/network/utils/ethtool/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ethtool -PKG_VERSION:=6.14 +PKG_VERSION:=6.15 PKG_RELEASE:=1 PKG_MAINTAINER:=Felix Fietkau PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/network/ethtool -PKG_HASH:=9338bb00e492878d3bbe3cd2894e60db35813634c208db0b20f5c7ee84da69b1 +PKG_HASH:=9477c365114d910120aaec5336a1d16196c833d8486f7c6da67bedef57880ade PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING 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 index 58cb2f066c7..7bc74ad3bc9 100644 --- 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 @@ -37,7 +37,7 @@ Signed-off-by: Daniel Golle [Install the bash-completion script in this directory. @<:@default=yes@:>@]), --- a/ethtool.c +++ b/ethtool.c -@@ -4114,7 +4114,7 @@ static int do_grxfh(struct cmd_context * +@@ -4170,7 +4170,7 @@ static int do_grxfh(struct cmd_context * } if (rss->hfunc) printf(" Unknown hash function: 0x%x\n", rss->hfunc); @@ -46,7 +46,7 @@ Signed-off-by: Daniel Golle printf("RSS input transformation:\n"); printf(" symmetric-xor: %s\n", (rss->input_xfrm & RXH_XFRM_SYM_XOR) ? "on" : "off"); -@@ -4123,6 +4123,7 @@ static int do_grxfh(struct cmd_context * +@@ -4182,6 +4182,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); @@ -54,7 +54,7 @@ Signed-off-by: Daniel Golle out: free(hfuncs); -@@ -4442,7 +4443,15 @@ static int do_srxfh(struct cmd_context * +@@ -4503,7 +4504,15 @@ static int do_srxfh(struct cmd_context * rss->cmd = ETHTOOL_SRSSH; rss->rss_context = rss_context; rss->hfunc = req_hfunc; -- 2.47.3