2011-09-25 18:34:54 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/mac.h
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/mac.h
|
|
|
|
|
@@ -75,9 +75,10 @@
|
|
|
|
|
#define ATH9K_TXERR_XTXOP 0x08
|
|
|
|
|
#define ATH9K_TXERR_TIMER_EXPIRED 0x10
|
|
|
|
|
#define ATH9K_TX_ACKED 0x20
|
|
|
|
|
+#define ATH9K_TX_FLUSH 0x40
|
|
|
|
|
#define ATH9K_TXERR_MASK \
|
|
|
|
|
(ATH9K_TXERR_XRETRY | ATH9K_TXERR_FILT | ATH9K_TXERR_FIFO | \
|
|
|
|
|
- ATH9K_TXERR_XTXOP | ATH9K_TXERR_TIMER_EXPIRED)
|
|
|
|
|
+ ATH9K_TXERR_XTXOP | ATH9K_TXERR_TIMER_EXPIRED | ATH9K_TX_FLUSH)
|
|
|
|
|
|
|
|
|
|
#define ATH9K_TX_BA 0x01
|
|
|
|
|
#define ATH9K_TX_PWRMGMT 0x02
|
|
|
|
|
--- a/drivers/net/wireless/ath/ath9k/xmit.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
|
2011-09-30 22:23:35 +00:00
|
|
|
@@ -388,6 +388,7 @@ static void ath_tx_complete_aggr(struct
|
|
|
|
|
int nframes;
|
2011-09-25 18:34:54 +00:00
|
|
|
u8 tidno;
|
|
|
|
|
int i, retries;
|
|
|
|
|
+ bool flush = !!(ts->ts_status & ATH9K_TX_FLUSH);
|
|
|
|
|
|
|
|
|
|
skb = bf->bf_mpdu;
|
|
|
|
|
hdr = (struct ieee80211_hdr *)skb->data;
|
2011-09-30 22:23:35 +00:00
|
|
|
@@ -482,6 +483,8 @@ static void ath_tx_complete_aggr(struct
|
2011-09-25 18:34:54 +00:00
|
|
|
* the un-acked sub-frames
|
|
|
|
|
*/
|
|
|
|
|
txfail = 1;
|
|
|
|
|
+ } else if (flush) {
|
|
|
|
|
+ txpending = 1;
|
|
|
|
|
} else if (fi->retries < ATH_MAX_SW_RETRIES) {
|
2011-09-30 22:23:35 +00:00
|
|
|
if (txok || !an->sleeping)
|
|
|
|
|
ath_tx_set_retry(sc, txq, bf->bf_mpdu,
|
|
|
|
|
@@ -540,7 +543,8 @@ static void ath_tx_complete_aggr(struct
|
2011-09-25 18:34:54 +00:00
|
|
|
|
|
|
|
|
ath_tx_complete_buf(sc, bf, txq,
|
|
|
|
|
&bf_head,
|
|
|
|
|
- ts, 0, 1,
|
|
|
|
|
+ ts, 0,
|
|
|
|
|
+ !flush,
|
|
|
|
|
sta);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2011-09-30 22:23:35 +00:00
|
|
|
@@ -1446,6 +1450,7 @@ static void ath_drain_txq_list(struct at
|
2011-09-25 18:34:54 +00:00
|
|
|
struct ath_tx_status ts;
|
|
|
|
|
|
|
|
|
|
memset(&ts, 0, sizeof(ts));
|
|
|
|
|
+ ts.ts_status = ATH9K_TX_FLUSH;
|
|
|
|
|
INIT_LIST_HEAD(&bf_head);
|
|
|
|
|
|
|
|
|
|
while (!list_empty(list)) {
|
