Commit f6db1fd4 authored by Daniel Gabay's avatar Daniel Gabay Committed by Johannes Berg
Browse files

wifi: iwlwifi: mvm: Remove unused last_amsdu from reorder buffer 



The last_amsdu field is not used and appears to be a leftover
from a previous implementation, remove it.

Signed-off-by: default avatarDaniel Gabay <daniel.gabay@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241008072037.13ba0eeae0fd.I94985512596e5996f5ab199451ce851c59a5a72a@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1bf5964e

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+0 −2
Original line number Diff line number Diff line
@@ -780,7 +780,6 @@ struct iwl_mvm_tcm { 
 * @head_sn: reorder window head sn

 * @num_stored: number of mpdus stored in the buffer

 * @queue: queue of this reorder buffer

 * @last_amsdu: track last ASMDU SN for duplication detection

 * @valid: reordering is valid for this queue

 * @lock: protect reorder buffer internal state

 */
@@ -788,7 +787,6 @@ struct iwl_mvm_reorder_buffer { 
	u16 head_sn;

	u16 num_stored;

	int queue;

	u16 last_amsdu;

	bool valid;

	spinlock_t lock;

} ____cacheline_aligned_in_smp;

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

+1 −5
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm, 
	if (!buffer->num_stored && ieee80211_sn_less(sn, nssn)) {

		if (!amsdu || last_subframe)

			buffer->head_sn = nssn;

		/* No need to update AMSDU last SN - we are moving the head */



		spin_unlock_bh(&buffer->lock);

		return false;

	}
@@ -831,7 +831,6 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm, 
		if (!amsdu || last_subframe)

			buffer->head_sn = ieee80211_sn_inc(buffer->head_sn);



		/* No need to update AMSDU last SN - we are moving the head */

		spin_unlock_bh(&buffer->lock);

		return false;

	}
@@ -841,9 +840,6 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm, 
	__skb_queue_tail(&entries[index].frames, skb);

	buffer->num_stored++;



	if (amsdu)

		buffer->last_amsdu = sn;



	/*

	 * We cannot trust NSSN for AMSDU sub-frames that are not the last.

	 * The reason is that NSSN advances on the first sub-frame, and may