Commit d37b4862 authored by Seevalamuthu Mariappan's avatar Seevalamuthu Mariappan Committed by Kalle Valo
Browse files

ath11k: move static function ath11k_mac_vdev_setup_sync to top 



This is to prepare for monitor mode clean up.
No functional changes are done.

Co-developed-by: default avatarMiles Hu <milehu@codeaurora.org>
Signed-off-by: default avatarMiles Hu <milehu@codeaurora.org>
Co-developed-by: default avatarVasanthakumar Thiagarajan <vthiagar@codeaurora.org>
Signed-off-by: default avatarVasanthakumar Thiagarajan <vthiagar@codeaurora.org>
Signed-off-by: default avatarSeevalamuthu Mariappan <seevalam@codeaurora.org>
Signed-off-by: default avatarJouni Malinen <jouni@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210721162053.46290-2-jouni@codeaurora.org
parent 0e159d2c

drivers/net/wireless/ath/ath11k/mac.c

+14 −14
Original line number Diff line number Diff line
@@ -731,6 +731,20 @@ static int ath11k_monitor_vdev_up(struct ath11k *ar, int vdev_id) 
	return 0;

}



static inline int ath11k_mac_vdev_setup_sync(struct ath11k *ar)

{

	lockdep_assert_held(&ar->conf_mutex);



	if (test_bit(ATH11K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))

		return -ESHUTDOWN;



	if (!wait_for_completion_timeout(&ar->vdev_setup_done,

					 ATH11K_VDEV_SETUP_TIMEOUT_HZ))

		return -ETIMEDOUT;



	return ar->last_wmi_vdev_start_status ? -EINVAL : 0;

}



static int ath11k_mac_op_config(struct ieee80211_hw *hw, u32 changed)

{

	/* mac80211 requires this op to be present and that's why
@@ -5165,20 +5179,6 @@ static void ath11k_mac_op_remove_chanctx(struct ieee80211_hw *hw, 
	mutex_unlock(&ar->conf_mutex);

}



static inline int ath11k_mac_vdev_setup_sync(struct ath11k *ar)

{

	lockdep_assert_held(&ar->conf_mutex);



	if (test_bit(ATH11K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))

		return -ESHUTDOWN;



	if (!wait_for_completion_timeout(&ar->vdev_setup_done,

					 ATH11K_VDEV_SETUP_TIMEOUT_HZ))

		return -ETIMEDOUT;



	return ar->last_wmi_vdev_start_status ? -EINVAL : 0;

}



static int

ath11k_mac_vdev_start_restart(struct ath11k_vif *arvif,

			      const struct cfg80211_chan_def *chandef,