aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid Decotigny <decot@google.com>2011-04-27 18:32:41 +0000
committerDavid S. Miller <davem@davemloft.net>2011-04-29 14:03:02 -0700
commit1258c076edcf4a253657320cfc2bd24fd5981d79 (patch)
tree2305f7639a82f1ef3928deaf615539a6ce185a56 /drivers
parent707394972093e2056e1e8cc39be19cf9bcb3e7b3 (diff)
downloadkernel_samsung_smdk4412-1258c076edcf4a253657320cfc2bd24fd5981d79.zip
kernel_samsung_smdk4412-1258c076edcf4a253657320cfc2bd24fd5981d79.tar.gz
kernel_samsung_smdk4412-1258c076edcf4a253657320cfc2bd24fd5981d79.tar.bz2
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/acenic.c2
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;