iwlwifi: mvm: remove buggy and unnecessary hw_queue initialization

After converting the driver to TXQs, it no longer has any reason
to initialize vif->hw_queue/vif->cab_queue since it no longer sets
the HW_QUEUE_CONTROL flag. Remove the code that initialized those,
it was broken due to relying on an uninitialized stack value in
used_hw_queues, as Colin reported.

Reported-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index f24d73700ad66ad74246e229ce00dad1183c9df7..76bf7fbc0446c8431eb9ab9a69c9755b885efa86 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -262,9 +262,7 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
                .preferred_tsf = NUM_TSF_IDS,
                .found_vif = false,
        };
-       u32 ac;
-       int ret, i, queue_limit;
-       unsigned long used_hw_queues;
+       int ret, i;
 
        lockdep_assert_held(&mvm->mutex);
 
@@ -341,37 +339,9 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
        INIT_LIST_HEAD(&mvmvif->time_event_data.list);
        mvmvif->time_event_data.id = TE_MAX;
 
-       /* No need to allocate data queues to P2P Device MAC.*/
-       if (vif->type == NL80211_IFTYPE_P2P_DEVICE) {
-               for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
-                       vif->hw_queue[ac] = IEEE80211_INVAL_HW_QUEUE;
-
+       /* No need to allocate data queues to P2P Device MAC and NAN.*/
+       if (vif->type == NL80211_IFTYPE_P2P_DEVICE)
                return 0;
-       }
-
-       /*
-        * queues in mac80211 almost entirely independent of
-        * the ones here - no real limit
-        */
-       queue_limit = IEEE80211_MAX_QUEUES;
-
-       /*
-        * Find available queues, and allocate them to the ACs. When in
-        * DQA-mode they aren't really used, and this is done only so the
-        * mac80211 ieee80211_check_queues() function won't fail
-        */
-       for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
-               u8 queue = find_first_zero_bit(&used_hw_queues, queue_limit);
-
-               if (queue >= queue_limit) {
-                       IWL_ERR(mvm, "Failed to allocate queue\n");
-                       ret = -EIO;
-                       goto exit_fail;
-               }
-
-               __set_bit(queue, &used_hw_queues);
-               vif->hw_queue[ac] = queue;
-       }
 
        /* Allocate the CAB queue for softAP and GO interfaces */
        if (vif->type == NL80211_IFTYPE_AP ||