From 2592f328c114bf068ad3293ced8c5eb6b914130d Mon Sep 17 00:00:00 2001 From: David Decotigny Date: Wed, 27 Apr 2011 18:32:41 +0000 Subject: [PATCH] --- yaml --- r: 247040 b: refs/heads/master c: 1258c076edcf4a253657320cfc2bd24fd5981d79 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/acenic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2d01e3163702..84216ca5e1db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 707394972093e2056e1e8cc39be19cf9bcb3e7b3 +refs/heads/master: 1258c076edcf4a253657320cfc2bd24fd5981d79 diff --git a/trunk/drivers/net/acenic.c b/trunk/drivers/net/acenic.c index a5798991c8b1..82260ca70323 100644 --- a/trunk/drivers/net/acenic.c +++ b/trunk/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;