diff options
Diffstat (limited to 'drivers/net/sc92031.c')
-rw-r--r-- | drivers/net/sc92031.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c index 76290a8c3c14..f3ffc1df3b2d 100644 --- a/drivers/net/sc92031.c +++ b/drivers/net/sc92031.c | |||
@@ -1188,10 +1188,11 @@ static int sc92031_ethtool_set_settings(struct net_device *dev, | |||
1188 | { | 1188 | { |
1189 | struct sc92031_priv *priv = netdev_priv(dev); | 1189 | struct sc92031_priv *priv = netdev_priv(dev); |
1190 | void __iomem *port_base = priv->port_base; | 1190 | void __iomem *port_base = priv->port_base; |
1191 | u32 speed = ethtool_cmd_speed(cmd); | ||
1191 | u32 phy_ctrl; | 1192 | u32 phy_ctrl; |
1192 | u32 old_phy_ctrl; | 1193 | u32 old_phy_ctrl; |
1193 | 1194 | ||
1194 | if (!(cmd->speed == SPEED_10 || cmd->speed == SPEED_100)) | 1195 | if (!(speed == SPEED_10 || speed == SPEED_100)) |
1195 | return -EINVAL; | 1196 | return -EINVAL; |
1196 | if (!(cmd->duplex == DUPLEX_HALF || cmd->duplex == DUPLEX_FULL)) | 1197 | if (!(cmd->duplex == DUPLEX_HALF || cmd->duplex == DUPLEX_FULL)) |
1197 | return -EINVAL; | 1198 | return -EINVAL; |
@@ -1229,7 +1230,7 @@ static int sc92031_ethtool_set_settings(struct net_device *dev, | |||
1229 | // FIXME: Whole branch guessed | 1230 | // FIXME: Whole branch guessed |
1230 | phy_ctrl = 0; | 1231 | phy_ctrl = 0; |
1231 | 1232 | ||
1232 | if (cmd->speed == SPEED_10) | 1233 | if (speed == SPEED_10) |
1233 | phy_ctrl |= PhyCtrlSpd10; | 1234 | phy_ctrl |= PhyCtrlSpd10; |
1234 | else /* cmd->speed == SPEED_100 */ | 1235 | else /* cmd->speed == SPEED_100 */ |
1235 | phy_ctrl |= PhyCtrlSpd100; | 1236 | phy_ctrl |= PhyCtrlSpd100; |