diff --git a/SOURCES/0001-Add-string-to-display-support-for-KR-PHY.patch b/SOURCES/0001-Add-string-to-display-support-for-KR-PHY.patch new file mode 100644 index 0000000..167a2de --- /dev/null +++ b/SOURCES/0001-Add-string-to-display-support-for-KR-PHY.patch @@ -0,0 +1,26 @@ +From 4b467d78c334f2bc72ea5ae66141546d218a9766 Mon Sep 17 00:00:00 2001 +From: "Vasundhara, Volam" +Date: Tue, 12 Feb 2013 09:46:20 +0000 +Subject: [PATCH 1/2] ethtool: Add string to display support for KR PHY + +Signed-off-by: Vasundhara Volam +Signed-off-by: Ben Hutchings +--- + ethtool.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ethtool.c b/ethtool.c +index acac32a..8cc10b5 100644 +--- a/ethtool.c ++++ b/ethtool.c +@@ -512,6 +512,7 @@ dump_link_caps(const char *prefix, const char *an_prefix, u32 mask, + { 0, ADVERTISED_2500baseX_Full, "2500baseX/Full" }, + { 0, ADVERTISED_10000baseT_Full, "10000baseT/Full" }, + { 0, ADVERTISED_10000baseKX4_Full, "10000baseKX4/Full" }, ++ { 0, ADVERTISED_10000baseKR_Full, "10000baseKR/Full" }, + { 0, ADVERTISED_20000baseMLD2_Full, "20000baseMLD2/Full" }, + { 0, ADVERTISED_20000baseKR2_Full, "20000baseKR2/Full" }, + { 0, ADVERTISED_40000baseKR4_Full, "40000baseKR4/Full" }, +-- +1.8.3.1 + diff --git a/SOURCES/0002-Report-Backplane-as-supported-port.patch b/SOURCES/0002-Report-Backplane-as-supported-port.patch new file mode 100644 index 0000000..8eb776c --- /dev/null +++ b/SOURCES/0002-Report-Backplane-as-supported-port.patch @@ -0,0 +1,27 @@ +From e4e9f69dbcb55c4dca2323dce2e89edfa6e28ec4 Mon Sep 17 00:00:00 2001 +From: Ivan Vecera +Date: Thu, 20 Feb 2014 18:48:56 +0100 +Subject: [PATCH 2/2] ethtool: Report Backplane as supported port + +Signed-off-by: Ivan Vecera +Signed-off-by: Ben Hutchings +--- + ethtool.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ethtool.c b/ethtool.c +index 8cc10b5..658a7b2 100644 +--- a/ethtool.c ++++ b/ethtool.c +@@ -485,6 +485,8 @@ static void dump_supported(struct ethtool_cmd *ep) + fprintf(stdout, "MII "); + if (mask & SUPPORTED_FIBRE) + fprintf(stdout, "FIBRE "); ++ if (mask & SUPPORTED_Backplane) ++ fprintf(stdout, "Backplane "); + fprintf(stdout, "]\n"); + + dump_link_caps("Supported", "Supports", mask, 0); +-- +1.8.3.1 + diff --git a/SPECS/ethtool.spec b/SPECS/ethtool.spec index 469e842..6f94055 100644 --- a/SPECS/ethtool.spec +++ b/SPECS/ethtool.spec @@ -1,7 +1,7 @@ Name: ethtool Epoch: 2 Version: 3.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Settings tool for Ethernet NICs License: GPLv2 @@ -21,6 +21,8 @@ URL: http://ftp.kernel.org/pub/software/network/%{name}/ Source0: http://ftp.kernel.org/pub/software/network/%{name}/%{name}-%{version}.tar.xz BuildRequires: automake, autoconf Conflicts: filesystem < 3 +Patch0: 0001-Add-string-to-display-support-for-KR-PHY.patch +Patch1: 0002-Report-Backplane-as-supported-port.patch %description This utility allows querying and changing settings such as speed, @@ -29,6 +31,8 @@ network devices, especially of Ethernet devices. %prep %setup -q +%patch0 -p1 +%patch1 -p1 # Only needed when using upstream git # aclocal @@ -49,6 +53,9 @@ make DESTDIR=%{buildroot} INSTALL='install -p' install %{_mandir}/man8/%{name}.8* %changelog +* Wed Oct 1 2014 Ivan Vecera - 2:3.8-4 +- Resolves: bz#1141736 + * Fri Jan 24 2014 Daniel Mach - 2:3.8-3 - Mass rebuild 2014-01-24