aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/atl1c
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/atl1c
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/atl1c')
-rw-r--r--drivers/net/atl1c/atl1c_ethtool.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/atl1c/atl1c_ethtool.c b/drivers/net/atl1c/atl1c_ethtool.c
index 3af5a336a5af..b1eceee424aa 100644
--- a/drivers/net/atl1c/atl1c_ethtool.c
+++ b/drivers/net/atl1c/atl1c_ethtool.c
@@ -77,7 +77,8 @@ static int atl1c_set_settings(struct net_device *netdev,
77 if (ecmd->autoneg == AUTONEG_ENABLE) { 77 if (ecmd->autoneg == AUTONEG_ENABLE) {
78 autoneg_advertised = ADVERTISED_Autoneg; 78 autoneg_advertised = ADVERTISED_Autoneg;
79 } else { 79 } else {
80 if (ecmd->speed == SPEED_1000) { 80 u32 speed = ethtool_cmd_speed(ecmd);
81 if (speed == SPEED_1000) {
81 if (ecmd->duplex != DUPLEX_FULL) { 82 if (ecmd->duplex != DUPLEX_FULL) {
82 if (netif_msg_link(adapter)) 83 if (netif_msg_link(adapter))
83 dev_warn(&adapter->pdev->dev, 84 dev_warn(&adapter->pdev->dev,
@@ -86,7 +87,7 @@ static int atl1c_set_settings(struct net_device *netdev,
86 return -EINVAL; 87 return -EINVAL;
87 } 88 }
88 autoneg_advertised = ADVERTISED_1000baseT_Full; 89 autoneg_advertised = ADVERTISED_1000baseT_Full;
89 } else if (ecmd->speed == SPEED_100) { 90 } else if (speed == SPEED_100) {
90 if (ecmd->duplex == DUPLEX_FULL) 91 if (ecmd->duplex == DUPLEX_FULL)
91 autoneg_advertised = ADVERTISED_100baseT_Full; 92 autoneg_advertised = ADVERTISED_100baseT_Full;
92 else 93 else