[PATCH] acenic: Fix using the specified speed when configuring NIC

[PATCH] acenic: Fix using the specified speed when configuring NIC

[David Decotigny]

This patch needs review, as I did not test it: I only think something
is weird by looking at the code, but experts must confirm.

This tells the NIC to take the speed specified by ethtool into account
when configuring the NIC, instead of keeping the previous speed.

Signed-off-by: David Decotigny <decot@google.com>
---
 drivers/net/acenic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index a579899..82260ca 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -2720,7 +2720,7 @@ static int ace_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 		link |= LNK_NEGOTIATE;
 	if (ethtool_cmd_speed(ecmd) != speed) {
 		link &= ~(LNK_1000MB | LNK_100MB | LNK_10MB);
-		switch (speed) {
+		switch (ethtool_cmd_speed(ecmd)) {
 		case SPEED_1000:
 			link |= LNK_1000MB;
 			break;
-- 
1.7.3.1

Re: [PATCH] acenic: Fix using the specified speed when configuring NIC

[David Miller]

From: David Decotigny <decot@google.com>
Date: Sat, 16 Apr 2011 17:57:07 -0700

> This patch needs review, as I did not test it: I only think something
> is weird by looking at the code, but experts must confirm.
> 
> This tells the NIC to take the speed specified by ethtool into account
> when configuring the NIC, instead of keeping the previous speed.
> 
> Signed-off-by: David Decotigny <decot@google.com>

Looks correct, but seems to be dependent upon some other patches which
have feedback pending which you need to address.

Please resubmit that when the other series ends up being applied after
you've fixed it up.