[PATCH 1/3] ethtool: fix typo on setting speed 10000

[PATCH 1/3] ethtool: fix typo on setting speed 10000

[Auke Kok]

From: Jesse Brandeburg <jesse.brandeburg@intel.com>

fix the typo in speed 10000 setting.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---

 ethtool.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ethtool.c b/ethtool.c
index 3adf843..a668b49 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -524,7 +524,7 @@ static void parse_cmdline(int argc, char **argp)
 					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);

[PATCH 2/3] ethtool: update license field in specfile to be correctly defined

[Auke Kok]

RPM uses "License" as field and not "Copyright".

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---

 ethtool.spec.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ethtool.spec.in b/ethtool.spec.in
index 1705d7f..4ff736a 100644
--- a/ethtool.spec.in
+++ b/ethtool.spec.in
@@ -5,7 +5,7 @@ Group		: Utilities
 
 Summary		: A tool for setting ethernet parameters
 
-Copyright	: GPL
+License		: GPL
 URL		: http://sourceforge.net/projects/gkernel/
 
 Buildroot	: %{_tmppath}/%{name}-%{version}

[PATCH 3/3] ethtool: correct man page for advertise mask value of 10gig

[Auke Kok]

10 gigabit is defined as 0x1000 in the advertise mask. The man
page mistakenly lists 0x800.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---

 ethtool.8 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ethtool.8 b/ethtool.8
index af51056..cc6a46e 100644
--- a/ethtool.8
+++ b/ethtool.8
@@ -362,7 +362,7 @@ a hexidecimal value using one or a combination of the following values:
 .TP 3
 .BR "0x8000" "   2500 Full" "(not supported by IEEE standards)"
 .TP 3
-.BR "0x800" "    10000 Full"
+.BR "0x1000" "   10000 Full"
 .TP 3
 .BR "0x03F" "    Auto"
 .PD

Re: [PATCH 1/3] ethtool: fix typo on setting speed 10000

[Jeff Garzik]

Auke Kok wrote:
> From: Jesse Brandeburg <jesse.brandeburg@intel.com>
> 
> fix the typo in speed 10000 setting.
> 
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> ---
> 
>  ethtool.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

patches 1 and 2 failed to apply.  applied #3

Re: [PATCH 1/3] ethtool: fix typo on setting speed 10000

[Kok, Auke]

Jeff Garzik wrote:
> Auke Kok wrote:
>> From: Jesse Brandeburg <jesse.brandeburg@intel.com>
>>
>> fix the typo in speed 10000 setting.
>>
>> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
>> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
>> ---
>>
>>  ethtool.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> patches 1 and 2 failed to apply.  applied #3

can you refresh the tree on http://git.kernel.org/?p=network/ethtool/ethtool.git ?

I did indeed send the first two patches out earlier but they did not show up on
git.kernel.org, hence I posted them again.

Thanks,

Auke