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

Commit 435d0827 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: mvm: refactor iwl_mvm_flush_no_vif 



This function is very indented and hard to read.
Refactor it.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent cb8550e1

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

+19 −21
Original line number Diff line number Diff line
@@ -4002,6 +4002,8 @@ static int iwl_mvm_post_channel_switch(struct ieee80211_hw *hw, 


static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop)

{

	int i;



	if (drop) {

		if (iwl_mvm_has_new_tx_api(mvm))

			/* TODO new tx api */
@@ -4009,18 +4011,20 @@ static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop) 
				  "Need to implement flush TX queue\n");

		else

			iwl_mvm_flush_tx_path(mvm,

				iwl_mvm_flushable_queues(mvm) & queues,

				0);

	} else {

		if (iwl_mvm_has_new_tx_api(mvm)) {

			struct ieee80211_sta *sta;

			int i;

				iwl_mvm_flushable_queues(mvm) & queues, 0);

		return;

	}



			mutex_lock(&mvm->mutex);

	if (!iwl_mvm_has_new_tx_api(mvm)) {

		iwl_trans_wait_tx_queues_empty(mvm->trans, queues);

		return;

	}



	mutex_lock(&mvm->mutex);

	for (i = 0; i < ARRAY_SIZE(mvm->fw_id_to_mac_id); i++) {

				sta = rcu_dereference_protected(

						mvm->fw_id_to_mac_id[i],

		struct ieee80211_sta *sta;



		sta = rcu_dereference_protected(mvm->fw_id_to_mac_id[i],

						lockdep_is_held(&mvm->mutex));

		if (IS_ERR_OR_NULL(sta))

			continue;
@@ -4028,13 +4032,7 @@ static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop) 
		iwl_mvm_wait_sta_queues_empty(mvm,

					      iwl_mvm_sta_from_mac80211(sta));

	}



	mutex_unlock(&mvm->mutex);

		} else {

			iwl_trans_wait_tx_queues_empty(mvm->trans,

						       queues);

		}

	}

}



static void iwl_mvm_mac_flush(struct ieee80211_hw *hw,