Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1639806

[PATCH 4.10 051/129] iwlwifi: mvm: fix reorder timer re-arming

Show all headers | View raw

4.10-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Sara Sharon <sara.sharon@intel.com>

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 <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 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;
 

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 4.10 000/129] 4.10.16-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 051/129] iwlwifi: mvm: fix reorder timer re-arming Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 028/129] arm64: remove wrong CONFIG_PROC_SYSCTL ifdef Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 041/129] mwifiex: Avoid skipping WEP key deletion for AP Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 050/129] iwlwifi: pcie: fix the set of DMA memory mask Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 039/129] mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 057/129] iwlwifi: mvm: writing zero bytes to debugfs causes a crash Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 014/129] powerpc/mm: Fixup wrong LPCR_VRMASD value Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 030/129] spi: armada-3700: Remove spi_master_put in a3700_spi_remove() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 020/129] power: supply: bq24190_charger: Fix irq trigger to IRQF_TRIGGER_FALLING Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 048/129] iwlwifi: pcie: dont increment / decrement a bool Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 021/129] power: supply: bq24190_charger: Call set_mode_host() on pm_resume() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  [PATCH 4.10 017/129] powerpc/ftrace: Fix confusing help text for DISABLE_MPROFILE_KERNEL Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:00 +0200
  Re: [PATCH 4.10 000/129] 4.10.16-stable review Shuah Khan <shuahkh@osg.samsung.com> - 2017-05-11 18:10 +0200
    Re: [PATCH 4.10 000/129] 4.10.16-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 19:50 +0200
      Re: [PATCH 4.10 000/129] 4.10.16-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 20:20 +0200
  [PATCH 4.10 001/129] 9p: fix a potential acl leak Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-11 18:10 +0200
  Re: [PATCH 4.10 000/129] 4.10.16-stable review Shuah Khan <shuahkh@osg.samsung.com> - 2017-05-12 17:30 +0200
  Re: [PATCH 4.10 000/129] 4.10.16-stable review Guenter Roeck <linux@roeck-us.net> - 2017-05-12 22:00 +0200

csiph-web