[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, 32 insertions, 40 deletions

diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c
index d793d843f7d5..3dae15211b6a 100644
--- a/drivers/net/wireless/libertas/ethtool.c
+++ b/drivers/net/wireless/libertas/ethtool.c
@@ -109,29 +109,8 @@ static void libertas_ethtool_get_stats(struct net_device * dev,
                                 struct ethtool_stats * stats, u64 * data)
 {
         wlan_private *priv = dev->priv;
-
-        lbs_deb_enter(LBS_DEB_ETHTOOL);
-
-        stats->cmd = ETHTOOL_GSTATS;
-        BUG_ON(stats->n_stats != MESH_STATS_NUM);
-
-        data[0] = priv->mstats.fwd_drop_rbt;
-        data[1] = priv->mstats.fwd_drop_ttl;
-        data[2] = priv->mstats.fwd_drop_noroute;
-        data[3] = priv->mstats.fwd_drop_nobuf;
-        data[4] = priv->mstats.fwd_unicast_cnt;
-        data[5] = priv->mstats.fwd_bcast_cnt;
-        data[6] = priv->mstats.drop_blind;
-        data[7] = priv->mstats.tx_failed_cnt;
-
-        lbs_deb_enter(LBS_DEB_ETHTOOL);
-}
-
-static int libertas_ethtool_get_stats_count(struct net_device * dev)
-{
-        int ret;
-        wlan_private *priv = dev->priv;
         struct cmd_ds_mesh_access mesh_access;
+        int ret;
 
         lbs_deb_enter(LBS_DEB_ETHTOOL);
 
@@ -140,25 +119,38 @@ static int libertas_ethtool_get_stats_count(struct net_device * dev)
                         CMD_MESH_ACCESS, CMD_ACT_MESH_GET_STATS,
                         CMD_OPTION_WAITFORRSP, 0, &mesh_access);
 
-        if (ret) {
-                ret = 0;
-                goto done;
-        }
-
-        priv->mstats.fwd_drop_rbt = le32_to_cpu(mesh_access.data[0]);
-        priv->mstats.fwd_drop_ttl = le32_to_cpu(mesh_access.data[1]);
-        priv->mstats.fwd_drop_noroute = le32_to_cpu(mesh_access.data[2]);
-        priv->mstats.fwd_drop_nobuf = le32_to_cpu(mesh_access.data[3]);
-        priv->mstats.fwd_unicast_cnt = le32_to_cpu(mesh_access.data[4]);
-        priv->mstats.fwd_bcast_cnt = le32_to_cpu(mesh_access.data[5]);
-        priv->mstats.drop_blind = le32_to_cpu(mesh_access.data[6]);
-        priv->mstats.tx_failed_cnt = le32_to_cpu(mesh_access.data[7]);
+        if (ret)
+                return;
+
+        priv->mstats.fwd_drop_rbt = le32_to_cpu(mesh_access.data[0]);
+        priv->mstats.fwd_drop_ttl = le32_to_cpu(mesh_access.data[1]);
+        priv->mstats.fwd_drop_noroute = le32_to_cpu(mesh_access.data[2]);
+        priv->mstats.fwd_drop_nobuf = le32_to_cpu(mesh_access.data[3]);
+        priv->mstats.fwd_unicast_cnt = le32_to_cpu(mesh_access.data[4]);
+        priv->mstats.fwd_bcast_cnt = le32_to_cpu(mesh_access.data[5]);
+        priv->mstats.drop_blind = le32_to_cpu(mesh_access.data[6]);
+        priv->mstats.tx_failed_cnt = le32_to_cpu(mesh_access.data[7]);
+
+        data[0] = priv->mstats.fwd_drop_rbt;
+        data[1] = priv->mstats.fwd_drop_ttl;
+        data[2] = priv->mstats.fwd_drop_noroute;
+        data[3] = priv->mstats.fwd_drop_nobuf;
+        data[4] = priv->mstats.fwd_unicast_cnt;
+        data[5] = priv->mstats.fwd_bcast_cnt;
+        data[6] = priv->mstats.drop_blind;
+        data[7] = priv->mstats.tx_failed_cnt;
 
-        ret = MESH_STATS_NUM;
+        lbs_deb_enter(LBS_DEB_ETHTOOL);
+}
 
-done:
-        lbs_deb_enter_args(LBS_DEB_ETHTOOL, "ret %d", ret);
-        return ret;
+static int libertas_ethtool_get_sset_count(struct net_device * dev, int sset)
+{
+        switch (sset) {
+        case ETH_SS_STATS:
+                return MESH_STATS_NUM;
+        default:
+                return -EOPNOTSUPP;
+        }
 }
 
 static void libertas_ethtool_get_strings (struct net_device * dev,
@@ -185,7 +177,7 @@ struct ethtool_ops libertas_ethtool_ops = {
         .get_drvinfo = libertas_ethtool_get_drvinfo,
         .get_eeprom =  libertas_ethtool_get_eeprom,
         .get_eeprom_len = libertas_ethtool_get_eeprom_len,
-        .get_stats_count = libertas_ethtool_get_stats_count,
+        .get_sset_count = libertas_ethtool_get_sset_count,
         .get_ethtool_stats = libertas_ethtool_get_stats,
         .get_strings = libertas_ethtool_get_strings,
 };