Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bec9522a authored by Sharon Dvir's avatar Sharon Dvir Committed by Luca Coelho
Browse files

iwlwifi: mvm: fix uninitialized var while waiting for queues to empty 



While waiting for queues to empty,
If txq_id == IWL_MVM_INVALID_QUEUE for all txq_ids,
ret is used uninitialized.
Found by Klocwork.

Fixes: d6d517b7 ("iwlwifi: add wait for tx queue empty")
Signed-off-by: default avatarSharon Dvir <sharon.dvir@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent cf6c6ea3

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

+4 −3
Original line number Diff line number Diff line
@@ -1619,10 +1619,11 @@ static void iwl_mvm_disable_sta_queues(struct iwl_mvm *mvm, 
int iwl_mvm_wait_sta_queues_empty(struct iwl_mvm *mvm,

				  struct iwl_mvm_sta *mvm_sta)

{

	int i, ret;

	int i;



	for (i = 0; i < ARRAY_SIZE(mvm_sta->tid_data); i++) {

		u16 txq_id;

		int ret;



		spin_lock_bh(&mvm_sta->lock);

		txq_id = mvm_sta->tid_data[i].txq_id;
@@ -1633,10 +1634,10 @@ int iwl_mvm_wait_sta_queues_empty(struct iwl_mvm *mvm, 


		ret = iwl_trans_wait_txq_empty(mvm->trans, txq_id);

		if (ret)

			break;

			return ret;

	}



	return ret;

	return 0;

}



int iwl_mvm_rm_sta(struct iwl_mvm *mvm,