1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c
index 6943a6c3b948..6269438d365f 100644
--- a/drivers/net/atl1e/atl1e_ethtool.c
+++ b/drivers/net/atl1e/atl1e_ethtool.c
@@ -51,13 +51,13 @@ static int atl1e_get_settings(struct net_device *netdev,
         ecmd->transceiver = XCVR_INTERNAL;
 
         if (adapter->link_speed != SPEED_0) {
-                ecmd->speed = adapter->link_speed;
+                ethtool_cmd_speed_set(ecmd, adapter->link_speed);
                 if (adapter->link_duplex == FULL_DUPLEX)
                         ecmd->duplex = DUPLEX_FULL;
                 else
                         ecmd->duplex = DUPLEX_HALF;
         } else {
-                ecmd->speed = -1;
+                ethtool_cmd_speed_set(ecmd, -1);
                 ecmd->duplex = -1;
         }
 
@@ -95,18 +95,18 @@ static int atl1e_set_settings(struct net_device *netdev,
                 ecmd->advertising = hw->autoneg_advertised |
                                     ADVERTISED_TP | ADVERTISED_Autoneg;
 
-                adv4 = hw->mii_autoneg_adv_reg & ~MII_AR_SPEED_MASK;
+                adv4 = hw->mii_autoneg_adv_reg & ~ADVERTISE_ALL;
                 adv9 = hw->mii_1000t_ctrl_reg & ~MII_AT001_CR_1000T_SPEED_MASK;
                 if (hw->autoneg_advertised & ADVERTISE_10_HALF)
-                        adv4 |= MII_AR_10T_HD_CAPS;
+                        adv4 |= ADVERTISE_10HALF;
                 if (hw->autoneg_advertised & ADVERTISE_10_FULL)
-                        adv4 |= MII_AR_10T_FD_CAPS;
+                        adv4 |= ADVERTISE_10FULL;
                 if (hw->autoneg_advertised & ADVERTISE_100_HALF)
-                        adv4 |= MII_AR_100TX_HD_CAPS;
+                        adv4 |= ADVERTISE_100HALF;
                 if (hw->autoneg_advertised & ADVERTISE_100_FULL)
-                        adv4 |= MII_AR_100TX_FD_CAPS;
+                        adv4 |= ADVERTISE_100FULL;
                 if (hw->autoneg_advertised & ADVERTISE_1000_FULL)
-                        adv9 |= MII_AT001_CR_1000T_FD_CAPS;
+                        adv9 |= ADVERTISE_1000FULL;
 
                 if (adv4 != hw->mii_autoneg_adv_reg ||
                                 adv9 != hw->mii_1000t_ctrl_reg) {
@@ -382,9 +382,6 @@ static const struct ethtool_ops atl1e_ethtool_ops = {
         .get_eeprom_len         = atl1e_get_eeprom_len,
         .get_eeprom             = atl1e_get_eeprom,
         .set_eeprom             = atl1e_set_eeprom,
-        .set_tx_csum            = ethtool_op_set_tx_hw_csum,
-        .set_sg                 = ethtool_op_set_sg,
-        .set_tso                = ethtool_op_set_tso,
 };
 
 void atl1e_set_ethtool_ops(struct net_device *netdev)