Skip to contentSkip to conversation

Patch "iwlwifi: mvm: fix reorder timer re-arming" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message May 9, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

iwlwifi: mvm: fix reorder timer re-arming

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
iwlwifi-mvm-fix-reorder-timer-re-arming.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 5351f9ab254c30d41659924265f1ecd7b4758d9e Mon Sep 17 00:00:00 2001

From: Sara Sharon <[email protected]>
Date: Tue, 3 Jan 2017 21:03:35 +0200
Subject: iwlwifi: mvm: fix reorder timer re-arming

From: Sara Sharon <[email protected]>

commit 5351f9ab254c30d41659924265f1ecd7b4758d9e upstream.

When NSSN is behind the reorder buffer due to timeout the reorder timer isn't getting re-armed until NSSN catches up. Fix it.

Fixes 0690405fef29 ("iwlwifi: mvm: add reorder timeout per frame")
---
 drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +2 -1
@@ -409,7 +409,7 @@ static void iwl_mvm_release_frames(struc
 
 	/* ignore nssn smaller than head sn - this can happen due to timeout */
 	if (iwl_mvm_is_sn_less(nssn, ssn, reorder_buf->buf_size))
-		return;
+		goto set_timer;
 
 	while (iwl_mvm_is_sn_less(ssn, nssn, reorder_buf->buf_size)) {
 		int index = ssn % reorder_buf->buf_size;
@@ -432,6 +432,7 @@ static void iwl_mvm_release_frames(struc
 	}
 	reorder_buf->head_sn = nssn;
 
+set_timer:
 	if (reorder_buf->num_stored && !reorder_buf->removed) {
 		u16 index = reorder_buf->head_sn % reorder_buf->buf_size;
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/iwlwifi-mvm-synchronize-firmware-dma-paging-memory.patch queue-4.9/iwlwifi-mvm-fix-reorder-timer-re-arming.patch queue-4.9/iwlwifi-pcie-fix-the-set-of-dma-memory-mask.patch queue-4.9/iwlwifi-mvm-fix-pending-frame-counter-calculation.patch queue-4.9/iwlwifi-pcie-trans-remove-unused-shift_param.patch queue-4.9/iwlwifi-mvm-fix-references-to-first_agg_queue-in-dqa-mode.patch