1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index e681d239d43c..05f94e21b423 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -83,9 +83,10 @@ void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev)
                 return;
 
         /*
-         * Stop the TX queues.
+         * Stop the TX queues in mac80211.
          */
         ieee80211_stop_queues(rt2x00dev->hw);
+        rt2x00queue_stop_queues(rt2x00dev);
 
         /*
          * Disable RX.
@@ -157,7 +158,7 @@ static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac,
                 return;
 
         if (delayed_flags & DELAYED_UPDATE_BEACON)
-                rt2x00queue_update_beacon(rt2x00dev, vif);
+                rt2x00queue_update_beacon(rt2x00dev, vif, true);
 
         if (delayed_flags & DELAYED_CONFIG_ERP)
                 rt2x00lib_config_erp(rt2x00dev, intf, &conf);