net: atl*: convert to hw_features

Things left as they were:
 - atl1: is RX checksum really enabled?
 - atl2: copy-paste from atl1, with-errors-on-modify I presume
 - atl1c: there's a bug: MTU can't be changed if device is not up

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 6 insertions, 23 deletions

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index e973d056dc8f..98334a1f0c5c 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -2986,6 +2986,11 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
         netdev->features |= NETIF_F_SG;
         netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
 
+        netdev->hw_features = NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_TSO;
+
+        /* is this valid? see atl1_setup_mac_ctrl() */
+        netdev->features |= NETIF_F_RXCSUM;
+
         /*
          * patch for some L1 of old version,
          * the final version of L1 may not need these
@@ -3595,12 +3600,6 @@ static int atl1_set_pauseparam(struct net_device *netdev,
         return 0;
 }
 
-/* FIXME: is this right? -- CHS */
-static u32 atl1_get_rx_csum(struct net_device *netdev)
-{
-        return 1;
-}
-
 static void atl1_get_strings(struct net_device *netdev, u32 stringset,
         u8 *data)
 {
@@ -3668,13 +3667,9 @@ static const struct ethtool_ops atl1_ethtool_ops = {
         .set_ringparam          = atl1_set_ringparam,
         .get_pauseparam         = atl1_get_pauseparam,
         .set_pauseparam         = atl1_set_pauseparam,
-        .get_rx_csum            = atl1_get_rx_csum,
-        .set_tx_csum            = ethtool_op_set_tx_hw_csum,
         .get_link               = ethtool_op_get_link,
-        .set_sg                 = ethtool_op_set_sg,
         .get_strings            = atl1_get_strings,
         .nway_reset             = atl1_nway_reset,
         .get_ethtool_stats      = atl1_get_ethtool_stats,
         .get_sset_count         = atl1_get_sset_count,
-        .set_tso                = ethtool_op_set_tso,
 };
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index 937ef1afa5db..02761dd23fb8 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -1411,9 +1411,8 @@ static int __devinit atl2_probe(struct pci_dev *pdev,
 
         err = -EIO;
 
-#ifdef NETIF_F_HW_VLAN_TX
+        netdev->hw_features = NETIF_F_SG;
         netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
-#endif
 
         /* Init PHY as early as possible due to power saving issue  */
         atl2_phy_init(&adapter->hw);
@@ -1840,11 +1839,6 @@ static int atl2_set_settings(struct net_device *netdev,
         return 0;
 }
 
-static u32 atl2_get_tx_csum(struct net_device *netdev)
-{
-        return (netdev->features & NETIF_F_HW_CSUM) != 0;
-}
-
 static u32 atl2_get_msglevel(struct net_device *netdev)
 {
         return 0;
@@ -2112,12 +2106,6 @@ static const struct ethtool_ops atl2_ethtool_ops = {
         .get_eeprom_len         = atl2_get_eeprom_len,
         .get_eeprom             = atl2_get_eeprom,
         .set_eeprom             = atl2_set_eeprom,
-        .get_tx_csum            = atl2_get_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
-        .set_sg                 = ethtool_op_set_sg,
-#ifdef NETIF_F_TSO
-        .get_tso                = ethtool_op_get_tso,
-#endif
 };
 
 static void atl2_set_ethtool_ops(struct net_device *netdev)