Commit d4530f63 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: avoid variable shadowing 



Change a few places to not shadow variables.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220130115024.d53f2a7a9614.I7441559451d54b39dc0daeb4c31e5dce19d4d83e@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent ad8860fc

drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c

+2 −2
Original line number Diff line number Diff line
@@ -825,11 +825,11 @@ static void iwl_dbg_tlv_send_hcmds(struct iwl_fw_runtime *fwrt, 
}



static void iwl_dbg_tlv_apply_config(struct iwl_fw_runtime *fwrt,

				     struct list_head *config_list)

				     struct list_head *conf_list)

{

	struct iwl_dbg_tlv_node *node;



	list_for_each_entry(node, config_list, list) {

	list_for_each_entry(node, conf_list, list) {

		struct iwl_fw_ini_conf_set_tlv *config_list = (void *)node->tlv.data;

		u32 count, address, value;

		u32 len = (le32_to_cpu(node->tlv.length) - sizeof(*config_list)) / 8;

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+3 −3
Original line number Diff line number Diff line
@@ -1042,12 +1042,12 @@ static bool iwl_mvm_remove_inactive_tids(struct iwl_mvm *mvm, 
	 * Remove the ones that did.

	 */

	for_each_set_bit(tid, &tid_bitmap, IWL_MAX_TID_COUNT + 1) {

		u16 tid_bitmap;

		u16 q_tid_bitmap;



		mvmsta->tid_data[tid].txq_id = IWL_MVM_INVALID_QUEUE;

		mvm->queue_info[queue].tid_bitmap &= ~BIT(tid);



		tid_bitmap = mvm->queue_info[queue].tid_bitmap;

		q_tid_bitmap = mvm->queue_info[queue].tid_bitmap;



		/*

		 * We need to take into account a situation in which a TXQ was
@@ -1060,7 +1060,7 @@ static bool iwl_mvm_remove_inactive_tids(struct iwl_mvm *mvm, 
		 * Mark this queue in the right bitmap, we'll send the command

		 * to the firmware later.

		 */

		if (!(tid_bitmap & BIT(mvm->queue_info[queue].txq_tid)))

		if (!(q_tid_bitmap & BIT(mvm->queue_info[queue].txq_tid)))

			set_bit(queue, changetid_queues);



		IWL_DEBUG_TX_QUEUES(mvm,

drivers/net/wireless/intel/iwlwifi/mvm/tx.c

+0 −2
Original line number Diff line number Diff line
@@ -1602,8 +1602,6 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm, 
			seq_ctl = le16_to_cpu(hdr->seq_ctrl);



		if (unlikely(!seq_ctl)) {

			struct ieee80211_hdr *hdr = (void *)skb->data;



			/*

			 * If it is an NDP, we can't update next_reclaim since

			 * its sequence control is 0. Note that for that same

drivers/net/wireless/intel/iwlwifi/queue/tx.c

+3 −3
Original line number Diff line number Diff line
@@ -1307,10 +1307,10 @@ static inline dma_addr_t iwl_txq_gen1_tfd_tb_get_addr(struct iwl_trans *trans, 
	dma_addr_t hi_len;



	if (trans->trans_cfg->use_tfh) {

		struct iwl_tfh_tfd *tfd = _tfd;

		struct iwl_tfh_tb *tb = &tfd->tbs[idx];

		struct iwl_tfh_tfd *tfh_tfd = _tfd;

		struct iwl_tfh_tb *tfh_tb = &tfh_tfd->tbs[idx];



		return (dma_addr_t)(le64_to_cpu(tb->addr));

		return (dma_addr_t)(le64_to_cpu(tfh_tb->addr));

	}



	tfd = _tfd;

drivers/net/wireless/intel/iwlwifi/queue/tx.h

+5 −5
Original line number Diff line number Diff line
@@ -137,9 +137,9 @@ static inline u8 iwl_txq_gen1_tfd_get_num_tbs(struct iwl_trans *trans, 
	struct iwl_tfd *tfd;



	if (trans->trans_cfg->use_tfh) {

		struct iwl_tfh_tfd *tfd = _tfd;

		struct iwl_tfh_tfd *tfh_tfd = _tfd;



		return le16_to_cpu(tfd->num_tbs) & 0x1f;

		return le16_to_cpu(tfh_tfd->num_tbs) & 0x1f;

	}



	tfd = (struct iwl_tfd *)_tfd;
@@ -153,10 +153,10 @@ static inline u16 iwl_txq_gen1_tfd_tb_get_len(struct iwl_trans *trans, 
	struct iwl_tfd_tb *tb;



	if (trans->trans_cfg->use_tfh) {

		struct iwl_tfh_tfd *tfd = _tfd;

		struct iwl_tfh_tb *tb = &tfd->tbs[idx];

		struct iwl_tfh_tfd *tfh_tfd = _tfd;

		struct iwl_tfh_tb *tfh_tb = &tfh_tfd->tbs[idx];



		return le16_to_cpu(tb->tb_len);

		return le16_to_cpu(tfh_tb->tb_len);

	}



	tfd = (struct iwl_tfd *)_tfd;