Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / net / sc92031.c

diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index 76290a8..fa74314 100644 (file)
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
@@ -1173,7 +1173,8 @@ static int sc92031_ethtool_get_settings(struct net_device *dev,
        if (phy_ctrl & PhyCtrlAne)
                cmd->advertising |= ADVERTISED_Autoneg;
 
-       cmd->speed = (output_status & 0x2) ? SPEED_100 : SPEED_10;
+       ethtool_cmd_speed_set(cmd,
+                             (output_status & 0x2) ? SPEED_100 : SPEED_10);
        cmd->duplex = (output_status & 0x4) ? DUPLEX_FULL : DUPLEX_HALF;
        cmd->port = PORT_MII;
        cmd->phy_address = phy_address;
@@ -1188,10 +1189,11 @@ static int sc92031_ethtool_set_settings(struct net_device *dev,
 {
        struct sc92031_priv *priv = netdev_priv(dev);
        void __iomem *port_base = priv->port_base;
+       u32 speed = ethtool_cmd_speed(cmd);
        u32 phy_ctrl;
        u32 old_phy_ctrl;
 
-       if (!(cmd->speed == SPEED_10 || cmd->speed == SPEED_100))
+       if (!(speed == SPEED_10 || speed == SPEED_100))
                return -EINVAL;
        if (!(cmd->duplex == DUPLEX_HALF || cmd->duplex == DUPLEX_FULL))
                return -EINVAL;
@@ -1229,7 +1231,7 @@ static int sc92031_ethtool_set_settings(struct net_device *dev,
                // FIXME: Whole branch guessed
                phy_ctrl = 0;
 
-               if (cmd->speed == SPEED_10)
+               if (speed == SPEED_10)
                        phy_ctrl |= PhyCtrlSpd10;
                else /* cmd->speed == SPEED_100 */
                        phy_ctrl |= PhyCtrlSpd100;