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/sfc/ethtool.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/sfc/ethtool.c')
-rw-r--r-- | drivers/net/sfc/ethtool.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c index 5d8468fc5804..10b160a508f3 100644 --- a/drivers/net/sfc/ethtool.c +++ b/drivers/net/sfc/ethtool.c | |||
@@ -234,7 +234,8 @@ static int efx_ethtool_set_settings(struct net_device *net_dev, | |||
234 | int rc; | 234 | int rc; |
235 | 235 | ||
236 | /* GMAC does not support 1000Mbps HD */ | 236 | /* GMAC does not support 1000Mbps HD */ |
237 | if (ecmd->speed == SPEED_1000 && ecmd->duplex != DUPLEX_FULL) { | 237 | if ((ethtool_cmd_speed(ecmd) == SPEED_1000) && |
238 | (ecmd->duplex != DUPLEX_FULL)) { | ||
238 | netif_dbg(efx, drv, efx->net_dev, | 239 | netif_dbg(efx, drv, efx->net_dev, |
239 | "rejecting unsupported 1000Mbps HD setting\n"); | 240 | "rejecting unsupported 1000Mbps HD setting\n"); |
240 | return -EINVAL; | 241 | return -EINVAL; |