Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ec54716 authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: remove is_data_qos variable in TX 



"is_data_qos == true" is equivalent to "tid < IWL_MAX_TID_COUNT"
since tid is only assigned (and range-checked) in that case.

This removes a (harmless) smatch warning that occurs because it
can't seem to follow the above logic from the code.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 2d3d31b5

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

+2 −3
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb, 
	u16 seq_number = 0;

	u8 tid = IWL_MAX_TID_COUNT;

	u8 txq_id = info->hw_queue;

	bool is_data_qos = false, is_ampdu = false;

	bool is_ampdu = false;

	int hdrlen;



	mvmsta = iwl_mvm_sta_from_mac80211(sta);
@@ -694,7 +694,6 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb, 
		seq_number &= IEEE80211_SCTL_SEQ;

		hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);

		hdr->seq_ctrl |= cpu_to_le16(seq_number);

		is_data_qos = true;

		is_ampdu = info->flags & IEEE80211_TX_CTL_AMPDU;

	}
@@ -722,7 +721,7 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb, 
	if (iwl_trans_tx(mvm->trans, skb, dev_cmd, txq_id))

		goto drop_unlock_sta;



	if (is_data_qos && !ieee80211_has_morefrags(fc))

	if (tid < IWL_MAX_TID_COUNT && !ieee80211_has_morefrags(fc))

		mvmsta->tid_data[tid].seq_number = seq_number + 0x10;



	spin_unlock(&mvmsta->lock);