pool/ethtool
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 25406 from network:utilities

Browse Source 
Copy from network:utilities/ethtool based on submit request 25406 from user mseben

OBS-URL: https://build.opensuse.org/request/show/25406
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ethtool?expand=0&rev=8
This commit is contained in:
OBS User autobuild 2009-12-04 11:27:18 +00:00 committed by Git OBS Bridge
parent e7307cc626
commit fb18bb9a29
4 changed files with 48 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ethtool-cmd-speed-display-all.patch Normal file
View File

@ -0,0 +1,20 @@
ethtool: display all speed values, not just the predefined ones
Some NICs report speeds other than 10, 100, 1000, 10000 to user land.
At least display them properly.
Signed-off-by: Olaf Kirch <okir@suse.de>
------------------------------------------------------------------
diff -ur ethtool-6//ethtool.c speed//ethtool.c
--- ethtool-6.orig/ethtool.c 2009-11-19 08:28:23.000000000 +0100
+++ ethtool-6/ethtool.c 2009-11-19 08:22:46.000000000 +0100
@@ -819,7 +819,7 @@
fprintf(stdout, "10000Mb/s\n");
break;
default:
- fprintf(stdout, "Unknown! (%i)\n", ethtool_cmd_speed(ep));
+ fprintf(stdout, "%iMb/s\n", ethtool_cmd_speed(ep));
break;
};

13
ethtool-speed-parse.patch Normal file
View File

@ -0,0 +1,13 @@
Index: ethtool-6/ethtool.c
===================================================================
--- ethtool-6.orig/ethtool.c
+++ ethtool-6/ethtool.c
@@ -528,7 +528,7 @@ static void parse_cmdline(int argc, char
speed_wanted = SPEED_1000;
else if (!strcmp(argp[i], "2500"))
speed_wanted = SPEED_2500;
- else if (!strcmp(argp[1], "10000"))
+ else if (!strcmp(argp[i], "10000"))
speed_wanted = SPEED_10000;
else
show_usage(1);

6
ethtool.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 1 16:09:13 UTC 2009 - mseben@novell.com
- add speed-parse.patch : fix parse of 10Gbe option (bnc#557016)
- add cmd-speed-display-all.patch Display all NIC speeds [FATE#305494]
-------------------------------------------------------------------
Tue Nov 4 11:41:01 CET 2008 - hvogel@suse.de

65
ethtool.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ethtool (Version 6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,17 +19,21 @@
Name: ethtool
License: GPL v2 or later
License: GPLv2+
Group: Productivity/Networking/Diagnostic
AutoReqProv: on
Summary: Examine and Tune Ethernet-Based Network Interfaces
Version: 6
Release: 78
Release: 79
Url: http://git.kernel.org/?p=network/ethtool/ethtool.git
Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch0: ethtool-cmd-speed-use-full-variable.patch
Patch1: ethtool-LRO_support.patch
#PATCH-FIX-UPSTREAM Some NICs report speeds other than 10, 100, 1000, 10000 to user land. At least display them properly (FATE#305494)
Patch2: ethtool-cmd-speed-display-all.patch
#PATCH-FIX-UPSTREAM fix parse of 10Gbe option (bnc#557016)
Patch3: ethtool-speed-parse.patch
%description
Ethtool is a small utility for examining and tuning ethernet-based
@ -48,6 +52,8 @@ Authors:
%setup -q
%patch0 -p1
%patch1
%patch2 -p1
%patch3 -p1
%build
%{suse_update_config -f}
@ -69,56 +75,3 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING NEWS README ChangeLog
%changelog
* Tue Nov 04 2008 hvogel@suse.de
- Add support for LRO (Large Receive Offload) [bnc#440003]
* Fri Sep 12 2008 bphilips@suse.de
- Add support for larger speed field to do greater than 65535Mb/s devices
* Wed Dec 19 2007 mskibbe@suse.de
- Bug 285472 - network script does not work for /usr over NFS
* Fri Jul 27 2007 mskibbe@suse.de
- update to version 6 which includes:
o updates for a lot of NICs
o preparing for 10G NICs
o a log Bugfixes
* Thu Apr 12 2007 lnussel@suse.de
- remove superfluous buffer overflow check patch
* Wed Sep 06 2006 mskibbe@suse.de
- fix bug #202756 - No Buffer Overflow check in Ethtool
* Mon Sep 04 2006 mskibbe@suse.de
- update to version 5 which includes:
o Security: Avoid potential buffer overflow
o Feature: GSO support
o Feature: skge register dump
* Thu Aug 31 2006 mskibbe@suse.de
- update to version 4 which
o includes UFO support
o support long options
o includes e1000, pcnet32, tg3 updates
o added PPC4xx EMAC support
o Use hexdump instead of single values for register dump
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Sat Jan 29 2005 hvogel@suse.de
- update to version 3
* Mon Aug 23 2004 mmj@suse.de
- Update to ethtool-2 which includes all our patches
* Thu Jun 24 2004 meissner@suse.de
- Added pcnet32 register dumping LTC#9592/SUSE#42408.
* Mon May 24 2004 meissner@suse.de
- return error value from test option LTC#7166/SUSE#40960.
* Sun Jan 11 2004 adrian@suse.de
- build as user
* Tue Aug 26 2003 pthomas@suse.de
- Upgraded to 1.8
* Tue Aug 26 2003 pthomas@suse.de
- Remove the bogus rejection of devices whose names that do not begin
with either 'eth' or 'usb'.
* Mon Jun 02 2003 pthomas@suse.de
- Add support for AMD-8111.
* Fri Feb 07 2003 meissner@suse.de
- Upgraded to current CVS, which has some e1000 fixes needed by IBM.
* Thu Feb 06 2003 meissner@suse.de
- Upgraded to 1.7:
* Mon Jun 24 2002 pthomas@suse.de
- Initial package creation.
- Fix most gcc warnings.