iwlwifi: mvm: correctly fill the ac array in the iwl_mac_ctx_cmd

The indexes into the ac array in the iwl_mac_ctx_cmd are from the iwl_ac
enum and not the txfs.  The current code therefore puts the edca params
in the wrong indexes of the array, causing wrong priority for
data-streams of different ACs.
Fix this.

Note that this bug only occurs in NICs that use the new tx api, since in
the old tx api the txf number is equal to the corresponding ac in the
iwl_ac enum.

Signed-off-by: Naftali Goldstein <naftali.goldstein@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 53c217af13c8b488becf591afbcb8fe7d7b10cf4..699a887612b9859bc0a9670a08cbe91d2cde7280 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -558,15 +558,16 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm,
 
        for (i = 0; i < IEEE80211_NUM_ACS; i++) {
                u8 txf = iwl_mvm_mac_ac_to_tx_fifo(mvm, i);
+               u8 ucode_ac = iwl_mvm_mac80211_ac_to_ucode_ac(i);
 
-               cmd->ac[txf].cw_min =
+               cmd->ac[ucode_ac].cw_min =
                        cpu_to_le16(mvmvif->queue_params[i].cw_min);
-               cmd->ac[txf].cw_max =
+               cmd->ac[ucode_ac].cw_max =
                        cpu_to_le16(mvmvif->queue_params[i].cw_max);
-               cmd->ac[txf].edca_txop =
+               cmd->ac[ucode_ac].edca_txop =
                        cpu_to_le16(mvmvif->queue_params[i].txop * 32);
-               cmd->ac[txf].aifsn = mvmvif->queue_params[i].aifs;
-               cmd->ac[txf].fifos_mask = BIT(txf);
+               cmd->ac[ucode_ac].aifsn = mvmvif->queue_params[i].aifs;
+               cmd->ac[ucode_ac].fifos_mask = BIT(txf);
        }
 
        if (vif->bss_conf.qos)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index e2b451c3da3a03980be34974274c303a3ca8e7bb..a8b2ca87da330395f365d2849748b11244bf35cc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1537,6 +1537,7 @@ void iwl_mvm_hwrate_to_tx_rate(u32 rate_n_flags,
                               enum nl80211_band band,
                               struct ieee80211_tx_rate *r);
 u8 iwl_mvm_mac80211_idx_to_hwrate(int rate_idx);
+u8 iwl_mvm_mac80211_ac_to_ucode_ac(enum ieee80211_ac_numbers ac);
 void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm);
 u8 first_antenna(u8 mask);
 u8 iwl_mvm_next_antenna(struct iwl_mvm *mvm, u8 valid, u8 last_idx);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
index cc56ab88fb4394e31e6ca28635547198352727b7..aeece6e29fdf91a15cda03144ec5fbee53159d89 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
@@ -238,6 +238,18 @@ u8 iwl_mvm_mac80211_idx_to_hwrate(int rate_idx)
        return fw_rate_idx_to_plcp[rate_idx];
 }
 
+u8 iwl_mvm_mac80211_ac_to_ucode_ac(enum ieee80211_ac_numbers ac)
+{
+       static const u8 mac80211_ac_to_ucode_ac[] = {
+               AC_VO,
+               AC_VI,
+               AC_BE,
+               AC_BK
+       };
+
+       return mac80211_ac_to_ucode_ac[ac];
+}
+
 void iwl_mvm_rx_fw_error(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)
 {
        struct iwl_rx_packet *pkt = rxb_addr(rxb);