1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 143a28c666af..a6c3f8c8c302 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -709,10 +709,11 @@ static void cas_begin_auto_negotiation(struct cas *cp, struct ethtool_cmd *ep)
         if (ep->autoneg == AUTONEG_ENABLE)
                 cp->link_cntl = BMCR_ANENABLE;
         else {
+                u32 speed = ethtool_cmd_speed(ep);
                 cp->link_cntl = 0;
-                if (ep->speed == SPEED_100)
+                if (speed == SPEED_100)
                         cp->link_cntl |= BMCR_SPEED100;
-                else if (ep->speed == SPEED_1000)
+                else if (speed == SPEED_1000)
                         cp->link_cntl |= CAS_BMCR_SPEED1000;
                 if (ep->duplex == DUPLEX_FULL)
                         cp->link_cntl |= BMCR_FULLDPLX;
@@ -4653,6 +4654,7 @@ static int cas_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct cas *cp = netdev_priv(dev);
         unsigned long flags;
+        u32 speed = ethtool_cmd_speed(cmd);
 
         /* Verify the settings we care about. */
         if (cmd->autoneg != AUTONEG_ENABLE &&
@@ -4660,9 +4662,9 @@ static int cas_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                 return -EINVAL;
 
         if (cmd->autoneg == AUTONEG_DISABLE &&
-            ((cmd->speed != SPEED_1000 &&
-              cmd->speed != SPEED_100 &&
-              cmd->speed != SPEED_10) ||
+            ((speed != SPEED_1000 &&
+              speed != SPEED_100 &&
+              speed != SPEED_10) ||
              (cmd->duplex != DUPLEX_HALF &&
               cmd->duplex != DUPLEX_FULL)))
                 return -EINVAL;