Commit e6d419f9 authored Apr 17, 2020 by Johannes Berg Committed by Kalle Valo Apr 21, 2020

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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/iwlwifi.20200417100405.9d862ed72535.I9e27ccc3ee3c8855fc13682592b571581925dfbd@changeid

parent 38af8d5a

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1169,9 +1169,9 @@ static int iwl_mvm_inactivity_check(struct iwl_mvm *mvm, u8 alloc_for_sta)
		inactive_tid_bitmap,
		&unshare_queues,
		&changetid_queues);
		if (ret >= 0 && free_queue < 0) {
		if (ret && free_queue < 0) {
		queue_owner = sta;
		free_queue = ret;
		free_queue = i;
		}
		/* only unlock sta lock - we still need the queue info lock */
		spin_unlock_bh(&mvmsta->lock);

Admin message