1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 0644f1e91887..501b72821b4d 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -518,6 +518,14 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                 bf = bf_next;
         }
 
+        /* prepend un-acked frames to the beginning of the pending frame queue */
+        if (!list_empty(&bf_pending)) {
+                spin_lock_bh(&txq->axq_lock);
+                list_splice(&bf_pending, &tid->buf_q);
+                ath_tx_queue_tid(txq, tid);
+                spin_unlock_bh(&txq->axq_lock);
+        }
+
         if (tid->state & AGGR_CLEANUP) {
                 if (tid->baw_head == tid->baw_tail) {
                         tid->state &= ~AGGR_ADDBA_COMPLETE;
@@ -530,14 +538,6 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                 return;
         }
 
-        /* prepend un-acked frames to the beginning of the pending frame queue */
-        if (!list_empty(&bf_pending)) {
-                spin_lock_bh(&txq->axq_lock);
-                list_splice(&bf_pending, &tid->buf_q);
-                ath_tx_queue_tid(txq, tid);
-                spin_unlock_bh(&txq->axq_lock);
-        }
-
         rcu_read_unlock();
 
         if (needreset)
@@ -2077,8 +2077,8 @@ static void ath_wake_mac80211_queue(struct ath_softc *sc, struct ath_txq *txq)
 
         spin_lock_bh(&txq->axq_lock);
         if (txq->stopped && sc->tx.pending_frames[qnum] < ATH_MAX_QDEPTH) {
-                ath_mac80211_start_queue(sc, qnum);
-                txq->stopped = 0;
+                if (ath_mac80211_start_queue(sc, qnum))
+                        txq->stopped = 0;
         }
         spin_unlock_bh(&txq->axq_lock);
 }