From: David Decotigny <decot@google.com>
Date: Wed, 27 Apr 2011 18:32:41 +0000 (+0000)
Subject: acenic: Fix using the specified speed when configuring NIC
X-Git-Tag: firefly_0821_release~7613^2~1367^2~194
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1258c076edcf4a253657320cfc2bd24fd5981d79;p=firefly-linux-kernel-4.4.55.git

acenic: Fix using the specified speed when configuring NIC

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index a5798991c8b1..82260ca70323 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;