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 <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/20021
Signed-off-by: Nick Hainke <vincent@systemli.org>

diff --git a/package/network/utils/ethtool/Makefile b/package/network/utils/ethtool/Makefile
index aa663b5d60db68b8c75e44bc79b22f4641796458..991ee293a94a68c81ea9406fdb30a5e4cce63c5e 100644 (file)
--- 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 <nbd@nbd.name>
 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 58cb2f066c734e2113c2ca082aa140ba3c04cdbf..7bc74ad3bc975db2e7f0cc876d9bd5459049fff1 100644 (file)
--- 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 <daniel@makrotopia.org>
                           [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 <daniel@makrotopia.org>
        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 <daniel@makrotopia.org>
  
  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;