[netdrvr] Stop using legacy hooks ->self_test_count, ->get_stats_count

These have been superceded by the new ->get_sset_count() hook.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 11 deletions

diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 0e80406bfbd7..3423f33769b7 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -577,8 +577,6 @@ static void e1000_get_drvinfo(struct net_device *netdev,
 
         strncpy(drvinfo->fw_version, firmware_version, 32);
         strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
-        drvinfo->n_stats = E1000_STATS_LEN;
-        drvinfo->testinfo_len = E1000_TEST_LEN;
         drvinfo->regdump_len = e1000_get_regs_len(netdev);
         drvinfo->eedump_len = e1000_get_eeprom_len(netdev);
 }
@@ -1493,9 +1491,16 @@ static int e1000_link_test(struct e1000_adapter *adapter, u64 *data)
         return *data;
 }
 
-static int e1000_diag_test_count(struct net_device *netdev)
+static int e1000e_get_sset_count(struct net_device *netdev, int sset)
 {
-        return E1000_TEST_LEN;
+        switch (sset) {
+        case ETH_SS_TEST:
+                return E1000_TEST_LEN;
+        case ETH_SS_STATS:
+                return E1000_STATS_LEN;
+        default:
+                return -EOPNOTSUPP;
+        }
 }
 
 static void e1000_diag_test(struct net_device *netdev,
@@ -1692,11 +1697,6 @@ static int e1000_nway_reset(struct net_device *netdev)
         return 0;
 }
 
-static int e1000_get_stats_count(struct net_device *netdev)
-{
-        return E1000_STATS_LEN;
-}
-
 static void e1000_get_ethtool_stats(struct net_device *netdev,
                                     struct ethtool_stats *stats,
                                     u64 *data)
@@ -1760,12 +1760,11 @@ static const struct ethtool_ops e1000_ethtool_ops = {
         .set_sg                 = ethtool_op_set_sg,
         .get_tso                = ethtool_op_get_tso,
         .set_tso                = e1000_set_tso,
-        .self_test_count        = e1000_diag_test_count,
         .self_test              = e1000_diag_test,
         .get_strings            = e1000_get_strings,
         .phys_id                = e1000_phys_id,
-        .get_stats_count        = e1000_get_stats_count,
         .get_ethtool_stats      = e1000_get_ethtool_stats,
+        .get_sset_count         = e1000e_get_sset_count,
 };
 
 void e1000e_set_ethtool_ops(struct net_device *netdev)