Merge tag 'iwlwifi-next-for-kalle-2017-06-28' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / drivers / net / wireless / intel / iwlwifi / mvm / rxmq.c

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index cf48390f6f68ee973b30ec1abd267bcfd3646d92..f3e608196369a3885804b42331f442a16623e388 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -502,7 +502,7 @@ void iwl_mvm_reorder_timer_expired(unsigned long data)
                             buf->sta_id, sn);
                iwl_mvm_release_frames(buf->mvm, sta, NULL, buf, sn);
                rcu_read_unlock();
-       } else if (buf->num_stored) {
+       } else {
                /*
                 * If no frame expired and there are stored frames, index is now
                 * pointing to the first unexpired frame - modify timer