aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3/cxgb3_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
-rw-r--r--drivers/net/cxgb3/cxgb3_main.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 040491804efb..0526715cc8c7 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -1821,7 +1821,8 @@ static int set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
1821 * being requested. 1821 * being requested.
1822 */ 1822 */
1823 if (cmd->autoneg == AUTONEG_DISABLE) { 1823 if (cmd->autoneg == AUTONEG_DISABLE) {
1824 int cap = speed_duplex_to_caps(cmd->speed, cmd->duplex); 1824 u32 speed = ethtool_cmd_speed(cmd);
1825 int cap = speed_duplex_to_caps(speed, cmd->duplex);
1825 if (lc->supported & cap) 1826 if (lc->supported & cap)
1826 return 0; 1827 return 0;
1827 } 1828 }
@@ -1829,11 +1830,12 @@ static int set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
1829 } 1830 }
1830 1831
1831 if (cmd->autoneg == AUTONEG_DISABLE) { 1832 if (cmd->autoneg == AUTONEG_DISABLE) {
1832 int cap = speed_duplex_to_caps(cmd->speed, cmd->duplex); 1833 u32 speed = ethtool_cmd_speed(cmd);
1834 int cap = speed_duplex_to_caps(speed, cmd->duplex);
1833 1835
1834 if (!(lc->supported & cap) || cmd->speed == SPEED_1000) 1836 if (!(lc->supported & cap) || (speed == SPEED_1000))
1835 return -EINVAL; 1837 return -EINVAL;
1836 lc->requested_speed = cmd->speed; 1838 lc->requested_speed = speed;
1837 lc->requested_duplex = cmd->duplex; 1839 lc->requested_duplex = cmd->duplex;
1838 lc->advertising = 0; 1840 lc->advertising = 0;
1839 } else { 1841 } else {