diff options
| author | Liad Kaufman | 2016-08-03 17:41:27 +0200 |
|---|---|---|
| committer | Luca Coelho | 2016-09-19 08:04:53 +0200 |
| commit | d55092b4812827b577daf2da7b4e404d87571e0b (patch) | |
| tree | 0743ff28d4e697529b23fa3d762debbe7850d9b3 /drivers/net/wireless/intel/iwlwifi/mvm/sta.c | |
| parent | mwifiex: fix null pointer deference when adapter is null (diff) | |
| download | kernel-qcow2-linux-d55092b4812827b577daf2da7b4e404d87571e0b.tar.gz kernel-qcow2-linux-d55092b4812827b577daf2da7b4e404d87571e0b.tar.xz kernel-qcow2-linux-d55092b4812827b577daf2da7b4e404d87571e0b.zip | |
iwlwifi: mvm: remove variable shadowing
Variable "ac" defined twice. Fix that.
Fixes: commit 93f436e2c7fe ("iwlwifi: mvm: set sta_id in SCD_QUEUE_CONFIG cmd")
Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/sta.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c index 216aa54c8679..d3a0378b547f 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c @@ -745,14 +745,14 @@ static int iwl_mvm_sta_alloc_queue(struct iwl_mvm *mvm, .scd_queue = queue, .action = SCD_CFG_DISABLE_QUEUE, }; - u8 ac; + u8 txq_curr_ac; disable_agg_tids = iwl_mvm_remove_sta_queue_marking(mvm, queue); spin_lock_bh(&mvm->queue_info_lock); - ac = mvm->queue_info[queue].mac80211_ac; + txq_curr_ac = mvm->queue_info[queue].mac80211_ac; cmd.sta_id = mvm->queue_info[queue].ra_sta_id; - cmd.tx_fifo = iwl_mvm_ac_to_tx_fifo[ac]; + cmd.tx_fifo = iwl_mvm_ac_to_tx_fifo[txq_curr_ac]; cmd.tid = mvm->queue_info[queue].txq_tid; spin_unlock_bh(&mvm->queue_info_lock); |