aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/acenic.c
diff options
context:
space:
mode:
authorDavid Decotigny <decot@google.com>2011-04-27 14:32:39 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-29 17:03:00 -0400
commit25db0338813a8915457636b1f6abe6a28fa73f8d (patch)
tree29ea39e45de1342beb4e3c58da0cfbc9915b617e /drivers/net/acenic.c
parent8ae6daca85c8bbd6a32c382db5e2a2a989f8bed2 (diff)
ethtool: Use full 32 bit speed range in ethtool's set_settings
This makes sure the ethtool's set_settings() callback of network drivers don't ignore the 16 most significant bits when ethtool calls their set_settings(). All drivers compiled with make allyesconfig on x86_64 have been updated. 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 ee648fe5d96f..0b4d8d13c488 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -2718,7 +2718,7 @@ static int ace_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
2718 link |= LNK_TX_FLOW_CTL_Y; 2718 link |= LNK_TX_FLOW_CTL_Y;
2719 if (ecmd->autoneg == AUTONEG_ENABLE) 2719 if (ecmd->autoneg == AUTONEG_ENABLE)
2720 link |= LNK_NEGOTIATE; 2720 link |= LNK_NEGOTIATE;
2721 if (ecmd->speed != 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 (speed) {
2724 case SPEED_1000: 2724 case SPEED_1000: