summaryrefslogtreecommitdiffstats
path: root/drivers/net/jme.c
diff options
context:
space:
mode:
authorDavid Decotigny <decot@google.com>2011-04-27 20:32:39 +0200
committerDavid S. Miller <davem@davemloft.net>2011-04-29 23:03:00 +0200
commit25db0338813a8915457636b1f6abe6a28fa73f8d (patch)
tree29ea39e45de1342beb4e3c58da0cfbc9915b617e /drivers/net/jme.c
parentethtool: Call ethtool's get/set_settings callbacks with cleaned data (diff)
downloadlinux-25db0338813a8915457636b1f6abe6a28fa73f8d.tar.xz
linux-25db0338813a8915457636b1f6abe6a28fa73f8d.zip
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/jme.c')
-rw-r--r--drivers/net/jme.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index be4773f54a24..b5b174a8c149 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -2555,7 +2555,8 @@ jme_set_settings(struct net_device *netdev,
struct jme_adapter *jme = netdev_priv(netdev);
int rc, fdc = 0;
- if (ecmd->speed == SPEED_1000 && ecmd->autoneg != AUTONEG_ENABLE)
+ if (ethtool_cmd_speed(ecmd) == SPEED_1000
+ && ecmd->autoneg != AUTONEG_ENABLE)
return -EINVAL;
/*