ath9k: fix retry counting / BAR handling during queue flush

When tx is suspended temporarily and the queue is flushed, do not increase
the retry count or attempt to send out BAR frames. Instead simply retry
the affected subframes normally after the reset.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 8 insertions, 2 deletions

diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h
index 91c96546c0cd..5eb4ee454325 100644
--- 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
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 9903fc3af723..03b0a651a591 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -373,6 +373,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
         struct ath_frame_info *fi;
         int nframes;
         u8 tidno;
+        bool flush = !!(ts->ts_status & ATH9K_TX_FLUSH);
 
         skb = bf->bf_mpdu;
         hdr = (struct ieee80211_hdr *)skb->data;
@@ -461,6 +462,8 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                                  * the un-acked sub-frames
                                  */
                                 txfail = 1;
+                        } else if (flush) {
+                                txpending = 1;
                         } else if (fi->retries < ATH_MAX_SW_RETRIES) {
                                 if (txok || !an->sleeping)
                                         ath_tx_set_retry(sc, txq, bf->bf_mpdu);
@@ -518,7 +521,8 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 
                                                 ath_tx_complete_buf(sc, bf, txq,
                                                                     &bf_head,
-                                                                    ts, 0, 1);
+                                                                    ts, 0,
+                                                                    !flush);
                                                 break;
                                         }
 
@@ -1401,6 +1405,7 @@ static void ath_drain_txq_list(struct ath_softc *sc, struct ath_txq *txq,
         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)) {