blob: dfb09ba22e1c5ea9551061dfe456a914a5572c2e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -387,7 +387,6 @@ static void ath_tx_complete_aggr(struct
struct ath_frame_info *fi;
int nframes;
u8 tidno;
- bool clear_filter;
int i, retries;
skb = bf->bf_mpdu;
@@ -484,12 +483,10 @@ static void ath_tx_complete_aggr(struct
*/
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,
retries);
- clear_filter = true;
txpending = 1;
} else {
txfail = 1;
@@ -568,11 +565,13 @@ static void ath_tx_complete_aggr(struct
ieee80211_sta_set_tim(sta);
spin_lock_bh(&txq->axq_lock);
- if (clear_filter)
- tid->ac->clear_ps_filter = true;
skb_queue_splice(&bf_pending, &tid->buf_q);
- if (!an->sleeping)
+ if (!an->sleeping) {
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);
}
|
