From: John Crispin <john@phrozen.org>
To: Johannes Berg <johannes@sipsolutions.net>,
Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org,
John Crispin <john@phrozen.org>
Subject: [PATCH 6/6] ath11k: switch to using ieee80211_tx_status_ext()
Date: Sun, 14 Jul 2019 17:44:19 +0200 [thread overview]
Message-ID: <20190714154419.11854-7-john@phrozen.org> (raw)
In-Reply-To: <20190714154419.11854-1-john@phrozen.org>
This allows us to pass HE rates down into the stack.
Signed-off-by: John Crispin <john@phrozen.org>
---
drivers/net/wireless/ath/ath11k/dp_tx.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/dp_tx.c b/drivers/net/wireless/ath/ath11k/dp_tx.c
index 33404483ec0a..7fe6ca18fc27 100644
--- a/drivers/net/wireless/ath/ath11k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath11k/dp_tx.c
@@ -365,9 +365,12 @@ 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;
if (WARN_ON_ONCE(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) {
/* Must not happen */
@@ -431,12 +434,18 @@ 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.
- */
- ieee80211_tx_status(ar->hw, msdu);
+ spin_lock_bh(&ab->data_lock);
+ peer = ath11k_peer_find_by_id(ab, ts->peer_id);
+ arsta = (struct ath11k_sta *)peer->sta->drv_priv;
+ status.sta = peer->sta;
+ status.skb = msdu;
+ status.info = info;
+ status.rate = &arsta->last_txrate;
+ rcu_read_unlock();
+ ieee80211_tx_status_ext(ar->hw, &status);
+ spin_unlock_bh(&ab->data_lock);
+ return;
exit:
rcu_read_unlock();
--
2.20.1
next prev parent reply other threads:[~2019-07-14 15:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-14 15:44 [PATCH 0/6] mac80211: add HE TX rate reporting to radiotap John Crispin
2019-07-14 15:44 ` [PATCH 1/6] mac80211: add xmit rate to struct ieee80211_tx_status John Crispin
2019-07-14 15:44 ` [PATCH 2/6] mac80211: propagate struct ieee80211_tx_status into ieee80211_tx_monitor() John Crispin
2019-07-14 15:44 ` [PATCH 3/6] mac80211: add struct ieee80211_tx_status support to ieee80211_add_tx_radiotap_header John Crispin
2019-07-14 15:44 ` [PATCH 4/6] ath11k: drop tx_info from ath11k_sta John Crispin
2019-07-14 15:44 ` [PATCH 5/6] ath11k: add HE rate accounting to driver John Crispin
2019-07-14 15:44 ` John Crispin [this message]
2019-08-09 23:23 ` [PATCH 6/6] ath11k: switch to using ieee80211_tx_status_ext() Pradeep Kumar Chitrapu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190714154419.11854-7-john@phrozen.org \
--to=john@phrozen.org \
--cc=ath11k@lists.infradead.org \
--cc=johannes@sipsolutions.net \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).