acenic: Fix using the specified speed when configuring NIC
authorDavid Decotigny <decot@google.com>
Wed, 27 Apr 2011 18:32:41 +0000 (18:32 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Apr 2011 21:03:02 +0000 (14:03 -0700)
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>
drivers/net/acenic.c

index a5798991c8b1da1fd6120838a5115740513f3b59..82260ca703235561b8de272268d6854ff9b54397 100644 (file)
@@ -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;