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, 4 insertions, 11 deletions

diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c
index 1209297433b8..47783749d9fa 100644
--- a/drivers/net/atl1e/atl1e_ethtool.c
+++ b/drivers/net/atl1e/atl1e_ethtool.c
@@ -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)
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 1ff001a8270c..c05b2e7c93d0 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -1927,11 +1927,7 @@ void atl1e_down(struct atl1e_adapter *adapter)
          * reschedule our watchdog timer */
         set_bit(__AT_DOWN, &adapter->flags);
 
-#ifdef NETIF_F_LLTX
         netif_stop_queue(netdev);
-#else
-        netif_tx_disable(netdev);
-#endif
 
         /* reset MAC to disable all RX/TX */
         atl1e_reset_hw(&adapter->hw);
@@ -2223,10 +2219,10 @@ static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
         netdev->watchdog_timeo = AT_TX_WATCHDOG;
         atl1e_set_ethtool_ops(netdev);
 
-        netdev->features = NETIF_F_SG | NETIF_F_HW_CSUM |
-                NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-        netdev->features |= NETIF_F_LLTX;
-        netdev->features |= NETIF_F_TSO;
+        netdev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_TSO |
+                NETIF_F_HW_VLAN_TX;
+        netdev->features = netdev->hw_features |
+                NETIF_F_HW_VLAN_RX | NETIF_F_LLTX;
 
         return 0;
 }