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

Commit cf9d1188 authored by Eliad Peller's avatar Eliad Peller Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: fix tx seq_ctrl debug print 



Since seq_number is incremented right after using
it, so printed seq_ctrl was actually the next
one to be used.

Fix it by incrementing the seq_number only later,
before saving it.

Additionally, use the IEEE80211_SEQ_TO_SN macro
in order to print the actual sequence number.

Signed-off-by: default avatarEliad Peller <eliadx.peller@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 2d93aee1

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

+2 −3
Original line number Diff line number Diff line
@@ -390,7 +390,6 @@ int iwl_mvm_tx_skb(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);

		seq_number += 0x10;

		is_data_qos = true;

		is_ampdu = info->flags & IEEE80211_TX_CTL_AMPDU;

	}
@@ -407,13 +406,13 @@ int iwl_mvm_tx_skb(struct iwl_mvm *mvm, struct sk_buff *skb, 
	}



	IWL_DEBUG_TX(mvm, "TX to [%d|%d] Q:%d - seq: 0x%x\n", mvmsta->sta_id,

		     tid, txq_id, seq_number);

		     tid, txq_id, IEEE80211_SEQ_TO_SN(seq_number));



	if (iwl_trans_tx(mvm->trans, skb, dev_cmd, txq_id))

		goto drop_unlock_sta;



	if (is_data_qos && !ieee80211_has_morefrags(fc))

		mvmsta->tid_data[tid].seq_number = seq_number;

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



	spin_unlock(&mvmsta->lock);