#define ATH9K_TX_PWRMGMT 0x02
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -389,6 +389,7 @@ static void ath_tx_complete_aggr(struct
+@@ -388,6 +388,7 @@ static void ath_tx_complete_aggr(struct
+ int nframes;
u8 tidno;
- bool clear_filter;
int i, retries;
+ bool flush = !!(ts->ts_status & ATH9K_TX_FLUSH);
skb = bf->bf_mpdu;
hdr = (struct ieee80211_hdr *)skb->data;
-@@ -483,6 +484,8 @@ static void ath_tx_complete_aggr(struct
+@@ -482,6 +483,8 @@ static void ath_tx_complete_aggr(struct
* the un-acked sub-frames
*/
txfail = 1;
+ } else if (flush) {
+ txpending = 1;
} else if (fi->retries < ATH_MAX_SW_RETRIES) {
- if (!(ts->ts_status & ATH9K_TXERR_FILT) &&
- !an->sleeping)
-@@ -543,7 +546,8 @@ static void ath_tx_complete_aggr(struct
+ if (txok || !an->sleeping)
+ ath_tx_set_retry(sc, txq, bf->bf_mpdu,
+@@ -540,7 +543,8 @@ static void ath_tx_complete_aggr(struct
ath_tx_complete_buf(sc, bf, txq,
&bf_head,
sta);
break;
}
-@@ -1447,6 +1451,7 @@ static void ath_drain_txq_list(struct at
+@@ -1446,6 +1450,7 @@ static void ath_drain_txq_list(struct at
struct ath_tx_status ts;
memset(&ts, 0, sizeof(ts));