diff options
| author | Sara Sharon | 2017-01-03 20:03:35 +0100 |
|---|---|---|
| committer | Luca Coelho | 2017-02-08 11:55:32 +0100 |
| commit | 5351f9ab254c30d41659924265f1ecd7b4758d9e (patch) | |
| tree | 26dc38d9447a77f18c2cf84fa8ef110ff236ae89 /drivers/net | |
| parent | iwlwifi: mvm: fix references to first_agg_queue in DQA mode (diff) | |
| download | kernel-qcow2-linux-5351f9ab254c30d41659924265f1ecd7b4758d9e.tar.gz kernel-qcow2-linux-5351f9ab254c30d41659924265f1ecd7b4758d9e.tar.xz kernel-qcow2-linux-5351f9ab254c30d41659924265f1ecd7b4758d9e.zip | |
iwlwifi: mvm: fix reorder timer re-arming
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c index c154ab42c80d..d79e9c2a2654 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c @@ -418,7 +418,7 @@ static void iwl_mvm_release_frames(struct iwl_mvm *mvm, /* 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; @@ -441,6 +441,7 @@ static void iwl_mvm_release_frames(struct iwl_mvm *mvm, } 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; |