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: Daniel Gabay <daniel.gabay@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241008072037.13ba0eeae0fd.I94985512596e5996f5ab199451ce851c59a5a72a@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index ff5d720b731413d772fdf88fd030fb44c904ace1..475e781e166a331d89c97d65945056c62dc9011a 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -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;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index 65f8933c34b420cdc75dc8ed4da98edea2106a9f..fdbd63ff91ef19e9d96cecff6c3230f983d417a6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -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