Commit 1258c076 authored by David Decotigny's avatar David Decotigny Committed by David S. Miller

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: default avatarDavid Decotigny <decot@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 70739497
...@@ -2720,7 +2720,7 @@ static int ace_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) ...@@ -2720,7 +2720,7 @@ static int ace_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
link |= LNK_NEGOTIATE; link |= LNK_NEGOTIATE;
if (ethtool_cmd_speed(ecmd) != speed) { if (ethtool_cmd_speed(ecmd) != speed) {
link &= ~(LNK_1000MB | LNK_100MB | LNK_10MB); link &= ~(LNK_1000MB | LNK_100MB | LNK_10MB);
switch (speed) { switch (ethtool_cmd_speed(ecmd)) {
case SPEED_1000: case SPEED_1000:
link |= LNK_1000MB; link |= LNK_1000MB;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment