mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifi

This patch removes all the virtual A-MPDU-queue bookkeeping from
mac80211. Curiously, iwlwifi already does its own bookkeeping, so
it doesn't require much changes except where it needs to handle
starting and stopping the queues in mac80211.

To handle the queue stop/wake properly, we rewrite the software
queue number for aggregation frames and internally to iwlwifi keep
track of the queues that map into the same AC queue, and only talk
to mac80211 about the AC queue. The implementation requires calling
two new functions, iwl_stop_queue and iwl_wake_queue instead of the
mac80211 counterparts.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Reinette Chattre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 7 insertions, 51 deletions

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 0247d8022f5f..fdf432f14554 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -339,29 +339,8 @@ static void __ieee80211_wake_queue(struct ieee80211_hw *hw, int queue,
 {
         struct ieee80211_local *local = hw_to_local(hw);
 
-        if (queue >= hw->queues) {
-                if (local->ampdu_ac_queue[queue - hw->queues] < 0)
-                        return;
-
-                /*
-                 * for virtual aggregation queues, we need to refcount the
-                 * internal mac80211 disable (multiple times!), keep track of
-                 * driver disable _and_ make sure the regular queue is
-                 * actually enabled.
-                 */
-                if (reason == IEEE80211_QUEUE_STOP_REASON_AGGREGATION)
-                        local->amdpu_ac_stop_refcnt[queue - hw->queues]--;
-                else
-                        __clear_bit(reason, &local->queue_stop_reasons[queue]);
-
-                if (local->queue_stop_reasons[queue] ||
-                    local->amdpu_ac_stop_refcnt[queue - hw->queues])
-                        return;
-
-                /* now go on to treat the corresponding regular queue */
-                queue = local->ampdu_ac_queue[queue - hw->queues];
-                reason = IEEE80211_QUEUE_STOP_REASON_AGGREGATION;
-        }
+        if (WARN_ON(queue >= hw->queues))
+                return;
 
         __clear_bit(reason, &local->queue_stop_reasons[queue]);
 
@@ -400,25 +379,8 @@ static void __ieee80211_stop_queue(struct ieee80211_hw *hw, int queue,
 {
         struct ieee80211_local *local = hw_to_local(hw);
 
-        if (queue >= hw->queues) {
-                if (local->ampdu_ac_queue[queue - hw->queues] < 0)
-                        return;
-
-                /*
-                 * for virtual aggregation queues, we need to refcount the
-                 * internal mac80211 disable (multiple times!), keep track of
-                 * driver disable _and_ make sure the regular queue is
-                 * actually enabled.
-                 */
-                if (reason == IEEE80211_QUEUE_STOP_REASON_AGGREGATION)
-                        local->amdpu_ac_stop_refcnt[queue - hw->queues]++;
-                else
-                        __set_bit(reason, &local->queue_stop_reasons[queue]);
-
-                /* now go on to treat the corresponding regular queue */
-                queue = local->ampdu_ac_queue[queue - hw->queues];
-                reason = IEEE80211_QUEUE_STOP_REASON_AGGREGATION;
-        }
+        if (WARN_ON(queue >= hw->queues))
+                return;
 
         /*
          * Only stop if it was previously running, this is necessary
@@ -474,15 +436,9 @@ EXPORT_SYMBOL(ieee80211_stop_queues);
 int ieee80211_queue_stopped(struct ieee80211_hw *hw, int queue)
 {
         struct ieee80211_local *local = hw_to_local(hw);
-        unsigned long flags;
 
-        if (queue >= hw->queues) {
-                spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
-                queue = local->ampdu_ac_queue[queue - hw->queues];
-                spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
-                if (queue < 0)
-                        return true;
-        }
+        if (WARN_ON(queue >= hw->queues))
+                return true;
 
         return __netif_subqueue_stopped(local->mdev, queue);
 }
@@ -497,7 +453,7 @@ void ieee80211_wake_queues_by_reason(struct ieee80211_hw *hw,
 
         spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
 
-        for (i = 0; i < hw->queues + hw->ampdu_queues; i++)
+        for (i = 0; i < hw->queues; i++)
                 __ieee80211_wake_queue(hw, i, reason);
 
         spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);