1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 0e1c76a8c045..d24b3f3e646b 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -4029,6 +4029,7 @@ static int nv_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
         struct fe_priv *np = netdev_priv(dev);
+        u32 speed = ethtool_cmd_speed(ecmd);
 
         if (ecmd->port != PORT_MII)
                 return -EINVAL;
@@ -4054,7 +4055,7 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                 /* Note: autonegotiation disable, speed 1000 intentionally
                  * forbidden - no one should need that. */
 
-                if (ecmd->speed != SPEED_10 && ecmd->speed != SPEED_100)
+                if (speed != SPEED_10 && speed != SPEED_100)
                         return -EINVAL;
                 if (ecmd->duplex != DUPLEX_HALF && ecmd->duplex != DUPLEX_FULL)
                         return -EINVAL;
@@ -4138,13 +4139,13 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 
                 adv = mii_rw(dev, np->phyaddr, MII_ADVERTISE, MII_READ);
                 adv &= ~(ADVERTISE_ALL | ADVERTISE_100BASE4 | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
-                if (ecmd->speed == SPEED_10 && ecmd->duplex == DUPLEX_HALF)
+                if (speed == SPEED_10 && ecmd->duplex == DUPLEX_HALF)
                         adv |= ADVERTISE_10HALF;
-                if (ecmd->speed == SPEED_10 && ecmd->duplex == DUPLEX_FULL)
+                if (speed == SPEED_10 && ecmd->duplex == DUPLEX_FULL)
                         adv |= ADVERTISE_10FULL;
-                if (ecmd->speed == SPEED_100 && ecmd->duplex == DUPLEX_HALF)
+                if (speed == SPEED_100 && ecmd->duplex == DUPLEX_HALF)
                         adv |= ADVERTISE_100HALF;
-                if (ecmd->speed == SPEED_100 && ecmd->duplex == DUPLEX_FULL)
+                if (speed == SPEED_100 && ecmd->duplex == DUPLEX_FULL)
                         adv |= ADVERTISE_100FULL;
                 np->pause_flags &= ~(NV_PAUSEFRAME_AUTONEG|NV_PAUSEFRAME_RX_ENABLE|NV_PAUSEFRAME_TX_ENABLE);
                 if (np->pause_flags & NV_PAUSEFRAME_RX_REQ) {/* for rx we set both advertisements but disable tx pause */