aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/natsemi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/natsemi.c')
-rw-r--r--drivers/net/natsemi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 1074231f0a0d..7633c67b7842 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -2908,7 +2908,8 @@ static int netdev_set_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
2908 return -EINVAL; 2908 return -EINVAL;
2909 } 2909 }
2910 } else if (ecmd->autoneg == AUTONEG_DISABLE) { 2910 } else if (ecmd->autoneg == AUTONEG_DISABLE) {
2911 if (ecmd->speed != SPEED_10 && ecmd->speed != SPEED_100) 2911 u32 speed = ethtool_cmd_speed(ecmd);
2912 if (speed != SPEED_10 && speed != SPEED_100)
2912 return -EINVAL; 2913 return -EINVAL;
2913 if (ecmd->duplex != DUPLEX_HALF && ecmd->duplex != DUPLEX_FULL) 2914 if (ecmd->duplex != DUPLEX_HALF && ecmd->duplex != DUPLEX_FULL)
2914 return -EINVAL; 2915 return -EINVAL;
@@ -2956,7 +2957,7 @@ static int netdev_set_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
2956 if (ecmd->advertising & ADVERTISED_100baseT_Full) 2957 if (ecmd->advertising & ADVERTISED_100baseT_Full)
2957 np->advertising |= ADVERTISE_100FULL; 2958 np->advertising |= ADVERTISE_100FULL;
2958 } else { 2959 } else {
2959 np->speed = ecmd->speed; 2960 np->speed = ethtool_cmd_speed(ecmd);
2960 np->duplex = ecmd->duplex; 2961 np->duplex = ecmd->duplex;
2961 /* user overriding the initial full duplex parm? */ 2962 /* user overriding the initial full duplex parm? */
2962 if (np->duplex == DUPLEX_HALF) 2963 if (np->duplex == DUPLEX_HALF)