Commit e6d419f9 authored by Johannes Berg's avatar Johannes Berg Committed by Kalle Valo

iwlwifi: mvm: fix inactive TID removal return value usage

The function iwl_mvm_remove_inactive_tids() returns bool, so we
should just check "if (ret)", not "if (ret >= 0)" (which would
do nothing useful here). We obviously therefore cannot use the
return value of the function for the free_queue, we need to use
the queue (i) we're currently dealing with instead.

Cc: stable@vger.kernel.org # v5.4+
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/iwlwifi.20200417100405.9d862ed72535.I9e27ccc3ee3c8855fc13682592b571581925dfbd@changeid
parent 38af8d5a
...@@ -1169,9 +1169,9 @@ static int iwl_mvm_inactivity_check(struct iwl_mvm *mvm, u8 alloc_for_sta) ...@@ -1169,9 +1169,9 @@ static int iwl_mvm_inactivity_check(struct iwl_mvm *mvm, u8 alloc_for_sta)
inactive_tid_bitmap, inactive_tid_bitmap,
&unshare_queues, &unshare_queues,
&changetid_queues); &changetid_queues);
if (ret >= 0 && free_queue < 0) { if (ret && free_queue < 0) {
queue_owner = sta; queue_owner = sta;
free_queue = ret; free_queue = i;
} }
/* only unlock sta lock - we still need the queue info lock */ /* only unlock sta lock - we still need the queue info lock */
spin_unlock_bh(&mvmsta->lock); spin_unlock_bh(&mvmsta->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment