Commit 55314fc2 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by Kalle Valo

ath10k: fix no-ack frame status

Use the new IEEE80211_TX_STAT_NOACK_TRANSMITTED flag
to indicate successful transmission of no-ack frames.
This fixes multicast frame accounting.
Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 6274cd41
...@@ -1297,6 +1297,7 @@ struct htt_tx_done { ...@@ -1297,6 +1297,7 @@ struct htt_tx_done {
u32 msdu_id; u32 msdu_id;
bool discard; bool discard;
bool no_ack; bool no_ack;
bool success;
}; };
struct htt_peer_map_event { struct htt_peer_map_event {
......
...@@ -1634,6 +1634,7 @@ static void ath10k_htt_rx_frm_tx_compl(struct ath10k *ar, ...@@ -1634,6 +1634,7 @@ static void ath10k_htt_rx_frm_tx_compl(struct ath10k *ar,
tx_done.no_ack = true; tx_done.no_ack = true;
break; break;
case HTT_DATA_TX_STATUS_OK: case HTT_DATA_TX_STATUS_OK:
tx_done.success = true;
break; break;
case HTT_DATA_TX_STATUS_DISCARD: case HTT_DATA_TX_STATUS_DISCARD:
case HTT_DATA_TX_STATUS_POSTPONE: case HTT_DATA_TX_STATUS_POSTPONE:
...@@ -1983,6 +1984,7 @@ void ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb) ...@@ -1983,6 +1984,7 @@ void ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
switch (status) { switch (status) {
case HTT_MGMT_TX_STATUS_OK: case HTT_MGMT_TX_STATUS_OK:
tx_done.success = true;
break; break;
case HTT_MGMT_TX_STATUS_RETRY: case HTT_MGMT_TX_STATUS_RETRY:
tx_done.no_ack = true; tx_done.no_ack = true;
......
...@@ -55,8 +55,10 @@ void ath10k_txrx_tx_unref(struct ath10k_htt *htt, ...@@ -55,8 +55,10 @@ void ath10k_txrx_tx_unref(struct ath10k_htt *htt,
lockdep_assert_held(&htt->tx_lock); lockdep_assert_held(&htt->tx_lock);
ath10k_dbg(ar, ATH10K_DBG_HTT, "htt tx completion msdu_id %u discard %d no_ack %d\n", ath10k_dbg(ar, ATH10K_DBG_HTT,
tx_done->msdu_id, !!tx_done->discard, !!tx_done->no_ack); "htt tx completion msdu_id %u discard %d no_ack %d success %d\n",
tx_done->msdu_id, !!tx_done->discard,
!!tx_done->no_ack, !!tx_done->success);
if (tx_done->msdu_id >= htt->max_num_pending_tx) { if (tx_done->msdu_id >= htt->max_num_pending_tx) {
ath10k_warn(ar, "warning: msdu_id %d too big, ignoring\n", ath10k_warn(ar, "warning: msdu_id %d too big, ignoring\n",
...@@ -97,6 +99,9 @@ void ath10k_txrx_tx_unref(struct ath10k_htt *htt, ...@@ -97,6 +99,9 @@ void ath10k_txrx_tx_unref(struct ath10k_htt *htt,
if (tx_done->no_ack) if (tx_done->no_ack)
info->flags &= ~IEEE80211_TX_STAT_ACK; info->flags &= ~IEEE80211_TX_STAT_ACK;
if (tx_done->success && (info->flags & IEEE80211_TX_CTL_NO_ACK))
info->flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED;
ieee80211_tx_status(htt->ar->hw, msdu); ieee80211_tx_status(htt->ar->hw, msdu);
/* we do not own the msdu anymore */ /* we do not own the msdu anymore */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment