diff options
Diffstat (limited to 'drivers/net/b44.c')
-rw-r--r-- | drivers/net/b44.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 2e2b76258ab4..909cc4b2a2f3 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
@@ -1831,6 +1831,7 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
1831 | static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) | 1831 | static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) |
1832 | { | 1832 | { |
1833 | struct b44 *bp = netdev_priv(dev); | 1833 | struct b44 *bp = netdev_priv(dev); |
1834 | u32 speed = ethtool_cmd_speed(cmd); | ||
1834 | 1835 | ||
1835 | /* We do not support gigabit. */ | 1836 | /* We do not support gigabit. */ |
1836 | if (cmd->autoneg == AUTONEG_ENABLE) { | 1837 | if (cmd->autoneg == AUTONEG_ENABLE) { |
@@ -1838,8 +1839,8 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
1838 | (ADVERTISED_1000baseT_Half | | 1839 | (ADVERTISED_1000baseT_Half | |
1839 | ADVERTISED_1000baseT_Full)) | 1840 | ADVERTISED_1000baseT_Full)) |
1840 | return -EINVAL; | 1841 | return -EINVAL; |
1841 | } else if ((cmd->speed != SPEED_100 && | 1842 | } else if ((speed != SPEED_100 && |
1842 | cmd->speed != SPEED_10) || | 1843 | speed != SPEED_10) || |
1843 | (cmd->duplex != DUPLEX_HALF && | 1844 | (cmd->duplex != DUPLEX_HALF && |
1844 | cmd->duplex != DUPLEX_FULL)) { | 1845 | cmd->duplex != DUPLEX_FULL)) { |
1845 | return -EINVAL; | 1846 | return -EINVAL; |
@@ -1873,7 +1874,7 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
1873 | } else { | 1874 | } else { |
1874 | bp->flags |= B44_FLAG_FORCE_LINK; | 1875 | bp->flags |= B44_FLAG_FORCE_LINK; |
1875 | bp->flags &= ~(B44_FLAG_100_BASE_T | B44_FLAG_FULL_DUPLEX); | 1876 | bp->flags &= ~(B44_FLAG_100_BASE_T | B44_FLAG_FULL_DUPLEX); |
1876 | if (cmd->speed == SPEED_100) | 1877 | if (speed == SPEED_100) |
1877 | bp->flags |= B44_FLAG_100_BASE_T; | 1878 | bp->flags |= B44_FLAG_100_BASE_T; |
1878 | if (cmd->duplex == DUPLEX_FULL) | 1879 | if (cmd->duplex == DUPLEX_FULL) |
1879 | bp->flags |= B44_FLAG_FULL_DUPLEX; | 1880 | bp->flags |= B44_FLAG_FULL_DUPLEX; |