From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:43244 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752673AbdEIJlq (ORCPT ); Tue, 9 May 2017 05:41:46 -0400 Subject: Patch "iwlwifi: mvm: fix reorder timer re-arming" has been added to the 4.9-stable tree To: sara.sharon@intel.com, gregkh@linuxfoundation.org, luciano.coelho@intel.com Cc: , From: Date: Tue, 09 May 2017 11:41:12 +0200 Message-ID: <149432287215977@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From 5351f9ab254c30d41659924265f1ecd7b4758d9e Mon Sep 17 00:00:00 2001 From: Sara Sharon Date: Tue, 3 Jan 2017 21:03:35 +0200 Subject: iwlwifi: mvm: fix reorder timer re-arming From: Sara Sharon 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") Signed-off-by: Sara Sharon Signed-off-by: Luca Coelho Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c @@ -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 sara.sharon@intel.com 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