iwlwifi: mvm: update aux queue in dqa mode

In DQA mode the AUX queue is mapped elsewhere than in non-
DQA mode. Update the code to reflect this.

Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 063ebbeb8481..a08db009d32a 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -577,18 +577,21 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
 
         mvm->restart_fw = iwlwifi_mod_params.restart_fw ? -1 : 0;
 
-        mvm->aux_queue = 15;
         if (!iwl_mvm_is_dqa_supported(mvm)) {
-                mvm->first_agg_queue = 16;
                 mvm->last_agg_queue = mvm->cfg->base_params->num_of_queues - 1;
+
+                if (mvm->cfg->base_params->num_of_queues == 16) {
+                        mvm->aux_queue = 11;
+                        mvm->first_agg_queue = 12;
+                } else {
+                        mvm->aux_queue = 15;
+                        mvm->first_agg_queue = 16;
+                }
         } else {
+                mvm->aux_queue = IWL_MVM_DQA_AUX_QUEUE;
                 mvm->first_agg_queue = IWL_MVM_DQA_MIN_DATA_QUEUE;
                 mvm->last_agg_queue = IWL_MVM_DQA_MAX_DATA_QUEUE;
         }
-        if (mvm->cfg->base_params->num_of_queues == 16) {
-                mvm->aux_queue = 11;
-                mvm->first_agg_queue = 12;
-        }
         mvm->sf_state = SF_UNINIT;
         mvm->cur_ucode = IWL_UCODE_INIT;
         mvm->drop_bcn_ap_mode = true;