1 files changed, 15 insertions, 20 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index bd3afc92f434..fa74acdd271f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -66,9 +66,9 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)
         set_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags);
 
         /*
-         * Enable RX.
+         * Enable queues.
          */
-        rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_RADIO_RX_ON);
+        rt2x00queue_start_queues(rt2x00dev);
         rt2x00link_start_tuner(rt2x00dev);
 
         /*
@@ -76,11 +76,6 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)
          */
         rt2x00link_start_watchdog(rt2x00dev);
 
-        /*
-         * Start the TX queues.
-         */
-        ieee80211_wake_queues(rt2x00dev->hw);
-
         return 0;
 }
 
@@ -90,21 +85,16 @@ void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev)
                 return;
 
         /*
-         * Stop the TX queues in mac80211.
-         */
-        ieee80211_stop_queues(rt2x00dev->hw);
-        rt2x00queue_stop_queues(rt2x00dev);
-
-        /*
          * Stop watchdog monitoring.
          */
         rt2x00link_stop_watchdog(rt2x00dev);
 
         /*
-         * Disable RX.
+         * Stop all queues
          */
         rt2x00link_stop_tuner(rt2x00dev);
-        rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_RADIO_RX_OFF);
+        rt2x00queue_stop_queues(rt2x00dev);
+        rt2x00queue_flush_queues(rt2x00dev, true);
 
         /*
          * Disable radio.
@@ -236,8 +226,16 @@ void rt2x00lib_pretbtt(struct rt2x00_dev *rt2x00dev)
 }
 EXPORT_SYMBOL_GPL(rt2x00lib_pretbtt);
 
+void rt2x00lib_dmastart(struct queue_entry *entry)
+{
+        set_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);
+        rt2x00queue_index_inc(entry->queue, Q_INDEX);
+}
+EXPORT_SYMBOL_GPL(rt2x00lib_dmastart);
+
 void rt2x00lib_dmadone(struct queue_entry *entry)
 {
+        set_bit(ENTRY_DATA_STATUS_PENDING, &entry->flags);
         clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);
         rt2x00queue_index_inc(entry->queue, Q_INDEX_DMA_DONE);
 }
@@ -249,7 +247,6 @@ void rt2x00lib_txdone(struct queue_entry *entry,
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
-        enum data_queue_qid qid = skb_get_queue_mapping(entry->skb);
         unsigned int header_length, i;
         u8 rate_idx, rate_flags, retry_rates;
         u8 skbdesc_flags = skbdesc->flags;
@@ -403,7 +400,7 @@ void rt2x00lib_txdone(struct queue_entry *entry,
          * is reenabled when the txdone handler has finished.
          */
         if (!rt2x00queue_threshold(entry->queue))
-                ieee80211_wake_queue(rt2x00dev->hw, qid);
+                rt2x00queue_unpause_queue(entry->queue);
 }
 EXPORT_SYMBOL_GPL(rt2x00lib_txdone);
 
@@ -566,10 +563,8 @@ submit_entry:
         entry->flags = 0;
         rt2x00queue_index_inc(entry->queue, Q_INDEX_DONE);
         if (test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags) &&
-            test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) {
+            test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
                 rt2x00dev->ops->lib->clear_entry(entry);
-                rt2x00queue_index_inc(entry->queue, Q_INDEX);
-        }
 }
 EXPORT_SYMBOL_GPL(rt2x00lib_rxdone);