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>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index dd70738eb2f4..a53629d9325d 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -197,11 +197,13 @@ static int e1000_set_settings(struct net_device *netdev,
                                                  ADVERTISED_TP |
                                                  ADVERTISED_Autoneg;
                 ecmd->advertising = hw->autoneg_advertised;
-        } else
-                if (e1000_set_spd_dplx(adapter, ecmd->speed + ecmd->duplex)) {
+        } else {
+                u32 speed = ethtool_cmd_speed(ecmd);
+                if (e1000_set_spd_dplx(adapter, speed + ecmd->duplex)) {
                         clear_bit(__E1000_RESETTING, &adapter->flags);
                         return -EINVAL;
                 }
+        }
 
         /* reset the link */