aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/acenic.c
diff options
context:
space:
mode:
authorDavid Decotigny <decot@google.com>2011-04-27 14:32:41 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-29 17:03:02 -0400
commit1258c076edcf4a253657320cfc2bd24fd5981d79 (patch)
tree2305f7639a82f1ef3928deaf615539a6ce185a56 /drivers/net/acenic.c
parent707394972093e2056e1e8cc39be19cf9bcb3e7b3 (diff)
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/net/acenic.c')
-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 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)
2720 link |= LNK_NEGOTIATE; 2720 link |= LNK_NEGOTIATE;
2721 if (ethtool_cmd_speed(ecmd) != speed) { 2721 if (ethtool_cmd_speed(ecmd) != speed) {
2722 link &= ~(LNK_1000MB | LNK_100MB | LNK_10MB); 2722 link &= ~(LNK_1000MB | LNK_100MB | LNK_10MB);
2723 switch (speed) { 2723 switch (ethtool_cmd_speed(ecmd)) {
2724 case SPEED_1000: 2724 case SPEED_1000:
2725 link |= LNK_1000MB; 2725 link |= LNK_1000MB;
2726 break; 2726 break;