ath11k: switch to using ieee80211_tx_status_ext()

This allows us to pass HE rates down into the stack.

Co-developed-by: Miles Hu <milehu@codeaurora.org>
Signed-off-by: Miles Hu <milehu@codeaurora.org>
Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220217012112.31211-2-pradeepc@codeaurora.org

diff --git a/drivers/net/wireless/ath/ath11k/dp_tx.c b/drivers/net/wireless/ath/ath11k/dp_tx.c
index 8402961c668877b73faa39cb7b89a0cf10823ef3..a680ab595b752b34f55c3aa53d4e596cea784a65 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath11k/dp_tx.c
@@ -518,9 +518,13 @@ static void ath11k_dp_tx_complete_msdu(struct ath11k *ar,
                                       struct sk_buff *msdu,
                                       struct hal_tx_status *ts)
 {
+       struct ieee80211_tx_status status = { 0 };
        struct ath11k_base *ab = ar->ab;
        struct ieee80211_tx_info *info;
        struct ath11k_skb_cb *skb_cb;
+       struct ath11k_peer *peer;
+       struct ath11k_sta *arsta;
+       struct rate_info rate;
 
        if (WARN_ON_ONCE(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) {
                /* Must not happen */
@@ -583,12 +587,26 @@ static void ath11k_dp_tx_complete_msdu(struct ath11k *ar,
                ath11k_dp_tx_cache_peer_stats(ar, msdu, ts);
        }
 
-       /* NOTE: Tx rate status reporting. Tx completion status does not have
-        * necessary information (for example nss) to build the tx rate.
-        * Might end up reporting it out-of-band from HTT stats.
-        */
+       spin_lock_bh(&ab->base_lock);
+       peer = ath11k_peer_find_by_id(ab, ts->peer_id);
+       if (!peer || !peer->sta) {
+               ath11k_dbg(ab, ATH11K_DBG_DATA,
+                          "dp_tx: failed to find the peer with peer_id %d\n",
+                           ts->peer_id);
+               spin_unlock_bh(&ab->base_lock);
+               dev_kfree_skb_any(msdu);
+               return;
+       }
+       arsta = (struct ath11k_sta *)peer->sta->drv_priv;
+       status.sta = peer->sta;
+       status.skb = msdu;
+       status.info = info;
+       rate = arsta->last_txrate;
+       status.rate = &rate;
 
-       ieee80211_tx_status(ar->hw, msdu);
+       spin_unlock_bh(&ab->base_lock);
+
+       ieee80211_tx_status_ext(ar->hw, &status);
 }
 
 static inline void ath11k_dp_tx_status_parse(struct ath11k_base *ab,