diff options
Diffstat (limited to 'drivers/net/via-velocity.c')
-rw-r--r-- | drivers/net/via-velocity.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index baf04b0a6575..9a8f116e6920 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
@@ -3247,9 +3247,11 @@ static int velocity_get_settings(struct net_device *dev, struct ethtool_cmd *cmd | |||
3247 | return 0; | 3247 | return 0; |
3248 | } | 3248 | } |
3249 | 3249 | ||
3250 | static int velocity_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) | 3250 | static int velocity_set_settings(struct net_device *dev, |
3251 | struct ethtool_cmd *cmd) | ||
3251 | { | 3252 | { |
3252 | struct velocity_info *vptr = netdev_priv(dev); | 3253 | struct velocity_info *vptr = netdev_priv(dev); |
3254 | u32 speed = ethtool_cmd_speed(cmd); | ||
3253 | u32 curr_status; | 3255 | u32 curr_status; |
3254 | u32 new_status = 0; | 3256 | u32 new_status = 0; |
3255 | int ret = 0; | 3257 | int ret = 0; |
@@ -3258,9 +3260,9 @@ static int velocity_set_settings(struct net_device *dev, struct ethtool_cmd *cmd | |||
3258 | curr_status &= (~VELOCITY_LINK_FAIL); | 3260 | curr_status &= (~VELOCITY_LINK_FAIL); |
3259 | 3261 | ||
3260 | new_status |= ((cmd->autoneg) ? VELOCITY_AUTONEG_ENABLE : 0); | 3262 | new_status |= ((cmd->autoneg) ? VELOCITY_AUTONEG_ENABLE : 0); |
3261 | new_status |= ((cmd->speed == SPEED_1000) ? VELOCITY_SPEED_1000 : 0); | 3263 | new_status |= ((speed == SPEED_1000) ? VELOCITY_SPEED_1000 : 0); |
3262 | new_status |= ((cmd->speed == SPEED_100) ? VELOCITY_SPEED_100 : 0); | 3264 | new_status |= ((speed == SPEED_100) ? VELOCITY_SPEED_100 : 0); |
3263 | new_status |= ((cmd->speed == SPEED_10) ? VELOCITY_SPEED_10 : 0); | 3265 | new_status |= ((speed == SPEED_10) ? VELOCITY_SPEED_10 : 0); |
3264 | new_status |= ((cmd->duplex == DUPLEX_FULL) ? VELOCITY_DUPLEX_FULL : 0); | 3266 | new_status |= ((cmd->duplex == DUPLEX_FULL) ? VELOCITY_DUPLEX_FULL : 0); |
3265 | 3267 | ||
3266 | if ((new_status & VELOCITY_AUTONEG_ENABLE) && | 3268 | if ((new_status & VELOCITY_AUTONEG_ENABLE) && |