1 files changed, 47 insertions, 27 deletions

diff --git a/drivers/net/wireless/ath/ath10k/debugfs_sta.c b/drivers/net/wireless/ath/ath10k/debugfs_sta.c
index 67ef75b60567..9955fea0802a 100644
--- a/drivers/net/wireless/ath/ath10k/debugfs_sta.c
+++ b/drivers/net/wireless/ath/ath10k/debugfs_sta.c
@@ -18,13 +18,34 @@
 #include "wmi-ops.h"
 #include "debug.h"
 
-void ath10k_sta_update_rx_duration(struct ath10k *ar, struct list_head *head)
-{       struct ieee80211_sta *sta;
+static void ath10k_sta_update_extd_stats_rx_duration(struct ath10k *ar,
+                                                     struct ath10k_fw_stats *stats)
+{
+        struct ath10k_fw_extd_stats_peer *peer;
+        struct ieee80211_sta *sta;
+        struct ath10k_sta *arsta;
+
+        rcu_read_lock();
+        list_for_each_entry(peer, &stats->peers_extd, list) {
+                sta = ieee80211_find_sta_by_ifaddr(ar->hw, peer->peer_macaddr,
+                                                   NULL);
+                if (!sta)
+                        continue;
+                arsta = (struct ath10k_sta *)sta->drv_priv;
+                arsta->rx_duration += (u64)peer->rx_duration;
+        }
+        rcu_read_unlock();
+}
+
+static void ath10k_sta_update_stats_rx_duration(struct ath10k *ar,
+                                                struct ath10k_fw_stats *stats)
+{
         struct ath10k_fw_stats_peer *peer;
+        struct ieee80211_sta *sta;
         struct ath10k_sta *arsta;
 
         rcu_read_lock();
-        list_for_each_entry(peer, head, list) {
+        list_for_each_entry(peer, &stats->peers, list) {
                 sta = ieee80211_find_sta_by_ifaddr(ar->hw, peer->peer_macaddr,
                                                    NULL);
                 if (!sta)
@@ -35,6 +56,29 @@ void ath10k_sta_update_rx_duration(struct ath10k *ar, struct list_head *head)
         rcu_read_unlock();
 }
 
+void ath10k_sta_update_rx_duration(struct ath10k *ar,
+                                   struct ath10k_fw_stats *stats)
+{
+        if (stats->extended)
+                ath10k_sta_update_extd_stats_rx_duration(ar, stats);
+        else
+                ath10k_sta_update_stats_rx_duration(ar, stats);
+}
+
+void ath10k_sta_statistics(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                           struct ieee80211_sta *sta,
+                           struct station_info *sinfo)
+{
+        struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv;
+        struct ath10k *ar = arsta->arvif->ar;
+
+        if (!ath10k_peer_stats_enabled(ar))
+                return;
+
+        sinfo->rx_duration = arsta->rx_duration;
+        sinfo->filled |= 1ULL << NL80211_STA_INFO_RX_DURATION;
+}
+
 static ssize_t ath10k_dbg_sta_read_aggr_mode(struct file *file,
                                              char __user *user_buf,
                                              size_t count, loff_t *ppos)
@@ -249,28 +293,6 @@ static const struct file_operations fops_delba = {
         .llseek = default_llseek,
 };
 
-static ssize_t ath10k_dbg_sta_read_rx_duration(struct file *file,
-                                               char __user *user_buf,
-                                               size_t count, loff_t *ppos)
-{
-        struct ieee80211_sta *sta = file->private_data;
-        struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv;
-        char buf[100];
-        int len = 0;
-
-        len = scnprintf(buf, sizeof(buf),
-                        "%llu usecs\n", arsta->rx_duration);
-
-        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static const struct file_operations fops_rx_duration = {
-        .read = ath10k_dbg_sta_read_rx_duration,
-        .open = simple_open,
-        .owner = THIS_MODULE,
-        .llseek = default_llseek,
-};
-
 void ath10k_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                             struct ieee80211_sta *sta, struct dentry *dir)
 {
@@ -279,6 +301,4 @@ void ath10k_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
         debugfs_create_file("addba", S_IWUSR, dir, sta, &fops_addba);
         debugfs_create_file("addba_resp", S_IWUSR, dir, sta, &fops_addba_resp);
         debugfs_create_file("delba", S_IWUSR, dir, sta, &fops_delba);
-        debugfs_create_file("rx_duration", S_IRUGO, dir, sta,
-                            &fops_rx_duration);
 }