import UBI ethtool-6.11-5.el10_0

0001-fix-MDI-X-showing-as-Unknown-instead-of-off-auto.patch

@@ -0,0 +1,45 @@
+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
+

ethtool.spec

@@ -2,13 +2,15 @@ Summary:        Settings tool for Ethernet NICs
 Name:           ethtool
 Epoch:          2
 Version:        6.11
-Release:        3%{?dist}
+Release:        5%{?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,6 +46,12 @@ make check
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Mon Apr 28 2025 Michal Schmidt <mschmidt@redhat.com> - 2:6.11-5
+- Fix MDI-X showing as Unknown (RHEL-75979)
+
+* Mon Dec  9 2024 Ivan Vecera <ivecera@redhat.com> - 2:6.11-4
+- Fixed gating
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2:6.11-3
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018