1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index d2a1ea98d0f2..fd356b7c0476 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -426,10 +426,14 @@ void rt2x00lib_txdone(struct queue_entry *entry,
         /*
          * If the data queue was below the threshold before the txdone
          * handler we must make sure the packet queue in the mac80211 stack
-         * is reenabled when the txdone handler has finished.
+         * is reenabled when the txdone handler has finished. This has to be
+         * serialized with rt2x00mac_tx(), otherwise we can wake up queue
+         * before it was stopped.
          */
+        spin_lock_bh(&entry->queue->tx_lock);
         if (!rt2x00queue_threshold(entry->queue))
                 rt2x00queue_unpause_queue(entry->queue);
+        spin_unlock_bh(&entry->queue->tx_lock);
 }
 EXPORT_SYMBOL_GPL(rt2x00lib_txdone);