Update to latest upstream release v6.15.

Resolves: RHEL-99667

Signed-off-by: Mohammad Heib <mheib@redhat.com>
This commit is contained in:
Mohammad Heib 2025-06-24 11:21:01 +03:00
parent 05f370d7d8
commit 7f1d42eb5b
3 changed files with 9 additions and 51 deletions

View File

@ -1,45 +0,0 @@
From c4874fb8866046ea62731399bc58740caeb154b7 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Wed, 12 Feb 2025 13:23:27 +0100
Subject: [PATCH] fix MDI-X showing as Unknown instead of "off (auto)"
The current version of ethtool is unable to show the correct MDI-X info:
# ethtool --version
ethtool version 6.11
# ethtool enp0s31f6 | grep MDI
MDI-X: Unknown
For comparison, an older version shows it correctly:
# ./ethtool --version
ethtool version 6.2
# ./ethtool enp0s31f6 | grep MDI
MDI-X: off (auto)
The blamed commit accidentally removed the ETH_TP_MDI switch case
in dump_mdix(). As a result, ETH_TP_MDI is treated like Unknown.
Fix it by restoring the ETH_TP_MDI case and breaking out.
'mdi_x' is initialized to false, which is correct for this case.
Fixes: bd1341cd2146 ("add json support for base command")
Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
---
common.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/common.c b/common.c
index 4fda4b49d2fd..1ba27e7577b4 100644
--- a/common.c
+++ b/common.c
@@ -171,6 +171,8 @@ void dump_mdix(u8 mdix, u8 mdix_ctrl)
mdi_x_forced = true;
} else {
switch (mdix) {
+ case ETH_TP_MDI:
+ break;
case ETH_TP_MDI_X:
mdi_x = true;
break;
--
2.49.0

View File

@ -1,16 +1,14 @@
Summary: Settings tool for Ethernet NICs
Name: ethtool
Epoch: 2
Version: 6.11
Release: 5%{?dist}
Version: 6.15
Release: 1%{?dist}
# {json_print,qsfp,sff-common}.{c,h} are GPL-2.0-or-later, rest is GPL-2.0-only
License: GPL-2.0-only AND GPL-2.0-or-later
URL: https://www.kernel.org/pub/software/network/%{name}/
Source0: https://www.kernel.org/pub/software/network/%{name}/%{name}-%{version}.tar.xz
Source1: https://www.kernel.org/pub/software/network/%{name}/%{name}-%{version}.tar.sign
Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/D2CB120AB45957B721CD9596F4554567B91DE934
# RHEL-75979
Patch1: 0001-fix-MDI-X-showing-as-Unknown-instead-of-off-auto.patch
BuildRequires: gnupg2, xz
BuildRequires: gcc
BuildRequires: libmnl-devel
@ -44,8 +42,13 @@ make check
%dir %{_datadir}/bash-completion/completions/
%{_datadir}/bash-completion/completions/%{name}
%{_mandir}/man8/%{name}.8*
%{_datadir}/metainfo/org.kernel.software.network.ethtool.metainfo.xml
%changelog
* Tue Jun 24 2025 Mohammad Heib <mheib@redhat.com> - 2:6.15-1
- Update to latest upstream release v6.15.
Resolves RHEL-99667.
* Mon Apr 28 2025 Michal Schmidt <mschmidt@redhat.com> - 2:6.11-5
- Fix MDI-X showing as Unknown (RHEL-75979)

View File

@ -1,2 +1,2 @@
SHA512 (ethtool-6.11.tar.sign) = 9a0ea5a1ab140a69bc13e844e2e919101ea0e3994a503b49ba5009e83ba4609d047c823dbc58b172ca0488591be066f43b66f1eea7597532930a83dddcc5e556
SHA512 (ethtool-6.11.tar.xz) = 77f649e1082a164e3627bcb21db1215a89d9a0e984f86516bb05879685aee76b034f6a9e19a499dcdd82883fa003f628b70d27ca8272064df27fe9de67c7a9a7
SHA512 (ethtool-6.15.tar.xz) = f140095e7c9e38d8b151796eed1301e9e6ab93e82d3e35b8a524b4f5be7b219e707bd270af7398195081085778c61948e15b39462a6a6f44aad6ffcaaddc3644
SHA512 (ethtool-6.15.tar.sign) = 085ebdf0c6a16a64002c60ed8de4b62e681b0d60ad8b9c6e0ad7f4ca0e51eb8eef3f8cab10d18e43e54c10578711d2cfbbb433cdae12a2ace65db5de53196c90