diff options
| author | David Decotigny <decot@google.com> | 2011-04-27 22:32:39 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-30 01:03:00 +0400 |
| commit | 25db0338813a8915457636b1f6abe6a28fa73f8d (patch) | |
| tree | 29ea39e45de1342beb4e3c58da0cfbc9915b617e /drivers/net/igb | |
| parent | 8ae6daca85c8bbd6a32c382db5e2a2a989f8bed2 (diff) | |
| download | linux-25db0338813a8915457636b1f6abe6a28fa73f8d.tar.xz | |
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/igb')
| -rw-r--r-- | drivers/net/igb/igb_ethtool.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c index d976733bbcc2..2cc221b65cd4 100644 --- a/drivers/net/igb/igb_ethtool.c +++ b/drivers/net/igb/igb_ethtool.c @@ -223,7 +223,8 @@ static int igb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) if (adapter->fc_autoneg) hw->fc.requested_mode = e1000_fc_default; } else { - if (igb_set_spd_dplx(adapter, ecmd->speed + ecmd->duplex)) { + u32 speed = ethtool_cmd_speed(ecmd); + if (igb_set_spd_dplx(adapter, speed + ecmd->duplex)) { clear_bit(__IGB_RESETTING, &adapter->state); return -EINVAL; } |