ath11k: Skip update peer stats for management packets

Currently HTT_PPDU_STATS_TAG_USR_COMPLTN_ACK_BA_STATUS tag of PPDU stats
doesn't have valid success bytes info of management frames.
So skip update peer stats for management packets.

Signed-off-by: Venkateswara Naralasetty <vnaralas@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath11k/dp.h b/drivers/net/wireless/ath/ath11k/dp.h
index db216f055c425630c481a635bd7e3b7d50507233..82ddd70177220c17610dc7ab2f458d96f9fc2c04 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/dp.h
+++ b/drivers/net/wireless/ath/ath11k/dp.h
@@ -1176,7 +1176,9 @@ struct htt_ppdu_stats_usr_cmpltn_cmn {
 
 #define HTT_PPDU_STATS_ACK_BA_INFO_NUM_MPDU_M  GENMASK(8, 0)
 #define HTT_PPDU_STATS_ACK_BA_INFO_NUM_MSDU_M  GENMASK(24, 9)
-#define HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM     GENMASK(3, 0)
+#define HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM     GENMASK(31, 25)
+
+#define HTT_PPDU_STATS_NON_QOS_TID     16
 
 struct htt_ppdu_stats_usr_cmpltn_ack_ba_status {
        u32 ppdu_id;

diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c
index 8f69de594ada24ea19aa07e52f59820f19c535d2..a380efb9caa69ae3d3d8b6f25c70fbbcab13cdba 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
@@ -1034,6 +1034,7 @@ ath11k_update_per_peer_tx_stats(struct ath11k *ar,
        u32 succ_bytes = 0;
        u16 rate = 0, succ_pkts = 0;
        u32 tx_duration = 0;
+       u8 tid = HTT_PPDU_STATS_NON_QOS_TID;
        bool is_ampdu = false;
 
        if (!usr_stats)
@@ -1051,6 +1052,8 @@ ath11k_update_per_peer_tx_stats(struct ath11k *ar,
                succ_bytes = usr_stats->ack_ba.success_bytes;
                succ_pkts = FIELD_GET(HTT_PPDU_STATS_ACK_BA_INFO_NUM_MSDU_M,
                                      usr_stats->ack_ba.info);
+               tid = FIELD_GET(HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM,
+                               usr_stats->ack_ba.info);
        }
 
        if (common->fes_duration_us)
@@ -1156,19 +1159,23 @@ ath11k_update_per_peer_tx_stats(struct ath11k *ar,
                ieee80211_tx_rate_update(ar->hw, sta, &arsta->tx_info);
        }
 
-       memset(peer_stats, 0, sizeof(*peer_stats));
-
-       peer_stats->succ_pkts = succ_pkts;
-       peer_stats->succ_bytes = succ_bytes;
-       peer_stats->is_ampdu = is_ampdu;
-       peer_stats->duration = tx_duration;
-       peer_stats->ba_fails =
-               HTT_USR_CMPLTN_LONG_RETRY(usr_stats->cmpltn_cmn.flags) +
-               HTT_USR_CMPLTN_SHORT_RETRY(usr_stats->cmpltn_cmn.flags);
-
-       if (ath11k_debug_is_extd_tx_stats_enabled(ar))
-               ath11k_accumulate_per_peer_tx_stats(arsta,
-                                                   peer_stats, rate_idx);
+       /* PPDU stats reported for mgmt packet doesn't have valid tx bytes.
+        * So skip peer stats update for mgmt packets.
+        */
+       if (tid < HTT_PPDU_STATS_NON_QOS_TID) {
+               memset(peer_stats, 0, sizeof(*peer_stats));
+               peer_stats->succ_pkts = succ_pkts;
+               peer_stats->succ_bytes = succ_bytes;
+               peer_stats->is_ampdu = is_ampdu;
+               peer_stats->duration = tx_duration;
+               peer_stats->ba_fails =
+                       HTT_USR_CMPLTN_LONG_RETRY(usr_stats->cmpltn_cmn.flags) +
+                       HTT_USR_CMPLTN_SHORT_RETRY(usr_stats->cmpltn_cmn.flags);
+
+               if (ath11k_debug_is_extd_tx_stats_enabled(ar))
+                       ath11k_accumulate_per_peer_tx_stats(arsta,
+                                                           peer_stats, rate_idx);
+       }
 
        spin_unlock_bh(&ab->base_lock);
        rcu_read_unlock();