diff options
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r-- | drivers/net/sky2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index c8d045114c66..5c7e2d68df2a 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -3452,8 +3452,9 @@ static int sky2_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
3452 | sky2->speed = -1; | 3452 | sky2->speed = -1; |
3453 | } else { | 3453 | } else { |
3454 | u32 setting; | 3454 | u32 setting; |
3455 | u32 speed = ethtool_cmd_speed(ecmd); | ||
3455 | 3456 | ||
3456 | switch (ecmd->speed) { | 3457 | switch (speed) { |
3457 | case SPEED_1000: | 3458 | case SPEED_1000: |
3458 | if (ecmd->duplex == DUPLEX_FULL) | 3459 | if (ecmd->duplex == DUPLEX_FULL) |
3459 | setting = SUPPORTED_1000baseT_Full; | 3460 | setting = SUPPORTED_1000baseT_Full; |
@@ -3486,7 +3487,7 @@ static int sky2_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
3486 | if ((setting & supported) == 0) | 3487 | if ((setting & supported) == 0) |
3487 | return -EINVAL; | 3488 | return -EINVAL; |
3488 | 3489 | ||
3489 | sky2->speed = ecmd->speed; | 3490 | sky2->speed = speed; |
3490 | sky2->duplex = ecmd->duplex; | 3491 | sky2->duplex = ecmd->duplex; |
3491 | sky2->flags &= ~SKY2_FLAG_AUTO_SPEED; | 3492 | sky2->flags &= ~SKY2_FLAG_AUTO_SPEED; |
3492 | } | 3493 | } |