2 files changed, 46 insertions, 0 deletions

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 815dc3f37e2b..27f956101bbd 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1514,6 +1514,16 @@ struct cfg80211_gtk_rekey_data {
  *      later passes to cfg80211_probe_status().
  *
  * @set_noack_map: Set the NoAck Map for the TIDs.
+ *
+ * @get_et_sset_count:  Ethtool API to get string-set count.
+ *      See @ethtool_ops.get_sset_count
+ *
+ * @get_et_stats:  Ethtool API to get a set of u64 stats.
+ *      See @ethtool_ops.get_ethtool_stats
+ *
+ * @get_et_strings:  Ethtool API to get a set of strings to describe stats
+ *      and perhaps other supported types of ethtool data-sets.
+ *      See @ethtool_ops.get_strings
  */
 struct cfg80211_ops {
         int     (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
@@ -1712,6 +1722,13 @@ struct cfg80211_ops {
 
         struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy,
                                                enum nl80211_channel_type *type);
+
+        int     (*get_et_sset_count)(struct wiphy *wiphy,
+                                     struct net_device *dev, int sset);
+        void    (*get_et_stats)(struct wiphy *wiphy, struct net_device *dev,
+                                struct ethtool_stats *stats, u64 *data);
+        void    (*get_et_strings)(struct wiphy *wiphy, struct net_device *dev,
+                                  u32 sset, u8 *data);
 };
 
 /*
diff --git a/net/wireless/ethtool.c b/net/wireless/ethtool.c
index 9bde4d1d3e9b..7eecdf40cf80 100644
--- a/net/wireless/ethtool.c
+++ b/net/wireless/ethtool.c
@@ -68,6 +68,32 @@ static int cfg80211_set_ringparam(struct net_device *dev,
         return -ENOTSUPP;
 }
 
+static int cfg80211_get_sset_count(struct net_device *dev, int sset)
+{
+        struct wireless_dev *wdev = dev->ieee80211_ptr;
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
+        if (rdev->ops->get_et_sset_count)
+                return rdev->ops->get_et_sset_count(wdev->wiphy, dev, sset);
+        return -EOPNOTSUPP;
+}
+
+static void cfg80211_get_stats(struct net_device *dev,
+                               struct ethtool_stats *stats, u64 *data)
+{
+        struct wireless_dev *wdev = dev->ieee80211_ptr;
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
+        if (rdev->ops->get_et_stats)
+                rdev->ops->get_et_stats(wdev->wiphy, dev, stats, data);
+}
+
+static void cfg80211_get_strings(struct net_device *dev, u32 sset, u8 *data)
+{
+        struct wireless_dev *wdev = dev->ieee80211_ptr;
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
+        if (rdev->ops->get_et_strings)
+                rdev->ops->get_et_strings(wdev->wiphy, dev, sset, data);
+}
+
 const struct ethtool_ops cfg80211_ethtool_ops = {
         .get_drvinfo = cfg80211_get_drvinfo,
         .get_regs_len = cfg80211_get_regs_len,
@@ -75,4 +101,7 @@ const struct ethtool_ops cfg80211_ethtool_ops = {
         .get_link = ethtool_op_get_link,
         .get_ringparam = cfg80211_get_ringparam,
         .set_ringparam = cfg80211_set_ringparam,
+        .get_strings = cfg80211_get_strings,
+        .get_ethtool_stats = cfg80211_get_stats,
+        .get_sset_count = cfg80211_get_sset_count,
 };