aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/skge.c
diff options
context:
space:
mode:
authorDavid Decotigny <decot@google.com>2011-04-27 14:32:39 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-29 17:03:00 -0400
commit25db0338813a8915457636b1f6abe6a28fa73f8d (patch)
tree29ea39e45de1342beb4e3c58da0cfbc9915b617e /drivers/net/skge.c
parent8ae6daca85c8bbd6a32c382db5e2a2a989f8bed2 (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/skge.c')
-rw-r--r--drivers/net/skge.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 176d784cbb54..a05e864de674 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -321,8 +321,9 @@ static int skge_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
321 skge->speed = -1; 321 skge->speed = -1;
322 } else { 322 } else {
323 u32 setting; 323 u32 setting;
324 u32 speed = ethtool_cmd_speed(ecmd);
324 325
325 switch (ecmd->speed) { 326 switch (speed) {
326 case SPEED_1000: 327 case SPEED_1000:
327 if (ecmd->duplex == DUPLEX_FULL) 328 if (ecmd->duplex == DUPLEX_FULL)
328 setting = SUPPORTED_1000baseT_Full; 329 setting = SUPPORTED_1000baseT_Full;
@@ -355,7 +356,7 @@ static int skge_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
355 if ((setting & supported) == 0) 356 if ((setting & supported) == 0)
356 return -EINVAL; 357 return -EINVAL;
357 358
358 skge->speed = ecmd->speed; 359 skge->speed = speed;
359 skge->duplex = ecmd->duplex; 360 skge->duplex = ecmd->duplex;
360 } 361 }
361 362