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/ixgb | |
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/ixgb')
-rw-r--r-- | drivers/net/ixgb/ixgb_ethtool.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c index cc53aa1541ba..edb3d7eaf6d5 100644 --- a/drivers/net/ixgb/ixgb_ethtool.c +++ b/drivers/net/ixgb/ixgb_ethtool.c | |||
@@ -129,9 +129,10 @@ static int | |||
129 | ixgb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) | 129 | ixgb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) |
130 | { | 130 | { |
131 | struct ixgb_adapter *adapter = netdev_priv(netdev); | 131 | struct ixgb_adapter *adapter = netdev_priv(netdev); |
132 | u32 speed = ethtool_cmd_speed(ecmd); | ||
132 | 133 | ||
133 | if (ecmd->autoneg == AUTONEG_ENABLE || | 134 | if (ecmd->autoneg == AUTONEG_ENABLE || |
134 | ecmd->speed + ecmd->duplex != SPEED_10000 + DUPLEX_FULL) | 135 | (speed + ecmd->duplex != SPEED_10000 + DUPLEX_FULL)) |
135 | return -EINVAL; | 136 | return -EINVAL; |
136 | 137 | ||
137 | if (netif_running(adapter->netdev)) { | 138 | if (netif_running(adapter->netdev)) { |