1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index a54f6873e9ea..76a2a7c118b2 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -99,7 +99,11 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
         /*
          * Determine which queue to put packet on.
          */
-        queue = rt2x00queue_get_queue(rt2x00dev, control->queue);
+        if (control->flags & IEEE80211_TXCTL_SEND_AFTER_DTIM &&
+            test_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags))
+                queue = rt2x00queue_get_queue(rt2x00dev, RT2X00_BCN_QUEUE_ATIM);
+        else
+                queue = rt2x00queue_get_queue(rt2x00dev, control->queue);
         if (unlikely(!queue)) {
                 ERROR(rt2x00dev,
                       "Attempt to send packet over invalid queue %d.\n"