diff options
author | David Decotigny <decot@google.com> | 2011-04-27 14:32:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-29 17:03:00 -0400 |
commit | 25db0338813a8915457636b1f6abe6a28fa73f8d (patch) | |
tree | 29ea39e45de1342beb4e3c58da0cfbc9915b617e /drivers/net/sunhme.c | |
parent | 8ae6daca85c8bbd6a32c382db5e2a2a989f8bed2 (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/sunhme.c')
-rw-r--r-- | drivers/net/sunhme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 80e907df36b4..8f3f02802427 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
@@ -1383,7 +1383,7 @@ force_link: | |||
1383 | if (ep == NULL || ep->autoneg == AUTONEG_ENABLE) { | 1383 | if (ep == NULL || ep->autoneg == AUTONEG_ENABLE) { |
1384 | hp->sw_bmcr = BMCR_SPEED100; | 1384 | hp->sw_bmcr = BMCR_SPEED100; |
1385 | } else { | 1385 | } else { |
1386 | if (ep->speed == SPEED_100) | 1386 | if (ethtool_cmd_speed(ep) == SPEED_100) |
1387 | hp->sw_bmcr = BMCR_SPEED100; | 1387 | hp->sw_bmcr = BMCR_SPEED100; |
1388 | else | 1388 | else |
1389 | hp->sw_bmcr = 0; | 1389 | hp->sw_bmcr = 0; |
@@ -2452,8 +2452,8 @@ static int hme_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
2452 | cmd->autoneg != AUTONEG_DISABLE) | 2452 | cmd->autoneg != AUTONEG_DISABLE) |
2453 | return -EINVAL; | 2453 | return -EINVAL; |
2454 | if (cmd->autoneg == AUTONEG_DISABLE && | 2454 | if (cmd->autoneg == AUTONEG_DISABLE && |
2455 | ((cmd->speed != SPEED_100 && | 2455 | ((ethtool_cmd_speed(cmd) != SPEED_100 && |
2456 | cmd->speed != SPEED_10) || | 2456 | ethtool_cmd_speed(cmd) != SPEED_10) || |
2457 | (cmd->duplex != DUPLEX_HALF && | 2457 | (cmd->duplex != DUPLEX_HALF && |
2458 | cmd->duplex != DUPLEX_FULL))) | 2458 | cmd->duplex != DUPLEX_FULL))) |
2459 | return -EINVAL; | 2459 | return -EINVAL; |