2011-09-25 18:34:54 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/xmit.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
|
2011-09-30 22:23:35 +00:00
|
|
|
@@ -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
|
2011-09-25 18:34:54 +00:00
|
|
|
*/
|
|
|
|
|
txfail = 1;
|
|
|
|
|
} else if (fi->retries < ATH_MAX_SW_RETRIES) {
|
|
|
|
|
- if (!(ts->ts_status & ATH9K_TXERR_FILT) ||
|
2011-09-30 22:23:35 +00:00
|
|
|
- !an->sleeping)
|
|
|
|
|
+ if (txok || !an->sleeping)
|
2011-09-25 18:34:54 +00:00
|
|
|
ath_tx_set_retry(sc, txq, bf->bf_mpdu,
|
|
|
|
|
retries);
|
2011-09-30 22:23:35 +00:00
|
|
|
|
|
|
|
|
- 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);
|
|
|
|
|
}
|
|
|
|
|
|
