Do not increment the retry counter if packets to a sleeping station
were not sent because of tx failure, instead of only checking the filter
flag.
Clear the PS filter only after an A-MPDU was reported as filtered,
otherwise the hardware might do some unnecessary extra retransmissions.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
struct ath_frame_info *fi;
int nframes;
u8 tidno;
struct ath_frame_info *fi;
int nframes;
u8 tidno;
skb = bf->bf_mpdu;
hdr = (struct ieee80211_hdr *)skb->data;
skb = bf->bf_mpdu;
hdr = (struct ieee80211_hdr *)skb->data;
*/
txfail = 1;
} else if (fi->retries < ATH_MAX_SW_RETRIES) {
*/
txfail = 1;
} else if (fi->retries < ATH_MAX_SW_RETRIES) {
- if (!(ts->ts_status & ATH9K_TXERR_FILT) ||
- !an->sleeping)
+ if (txok || !an->sleeping)
ath_tx_set_retry(sc, txq, bf->bf_mpdu);
ath_tx_set_retry(sc, txq, bf->bf_mpdu);
txpending = 1;
} else {
txfail = 1;
txpending = 1;
} else {
txfail = 1;
ieee80211_sta_set_buffered(sta, tid->tidno, true);
spin_lock_bh(&txq->axq_lock);
ieee80211_sta_set_buffered(sta, tid->tidno, true);
spin_lock_bh(&txq->axq_lock);
- if (clear_filter)
- tid->ac->clear_ps_filter = true;
skb_queue_splice(&bf_pending, &tid->buf_q);
skb_queue_splice(&bf_pending, &tid->buf_q);
ath_tx_queue_tid(txq, tid);
ath_tx_queue_tid(txq, tid);
+
+ if (ts->ts_status & ATH9K_TXERR_FILT)
+ tid->ac->clear_ps_filter = true;
+ }
spin_unlock_bh(&txq->axq_lock);
}
spin_unlock_bh(&txq->axq_lock);
}