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

ath11k: send beacon template after vdev_start/restart during csa 



Firmware has added assert if beacon template is received after
vdev_down. Firmware expects beacon template after vdev_start
and before vdev_up. This change is needed to support MBSSID EMA
cases in firmware.

Hence, Change the sequence in ath11k as expected from firmware.
This new change is not causing any issues with older
firmware.

Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1.r3-00011-QCAHKSWPL_SILICONZ-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1.r4-00008-QCAHKSWPL_SILICONZ-1

Fixes: d5c65159 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
Signed-off-by: default avatarSeevalamuthu Mariappan <seevalam@codeaurora.org>
[sven@narfation.org: added tested-on/fixes information]
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210525133028.2805615-1-sven@narfation.org
parent ea1c2023

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

+5 −5
Original line number Diff line number Diff line
@@ -5379,11 +5379,6 @@ ath11k_mac_update_vif_chan(struct ath11k *ar, 
		if (WARN_ON(!arvif->is_up))

			continue;



		ret = ath11k_mac_setup_bcn_tmpl(arvif);

		if (ret)

			ath11k_warn(ab, "failed to update bcn tmpl during csa: %d\n",

				    ret);



		ret = ath11k_mac_vdev_restart(arvif, &vifs[i].new_ctx->def);

		if (ret) {

			ath11k_warn(ab, "failed to restart vdev %d: %d\n",
@@ -5391,6 +5386,11 @@ ath11k_mac_update_vif_chan(struct ath11k *ar, 
			continue;

		}



		ret = ath11k_mac_setup_bcn_tmpl(arvif);

		if (ret)

			ath11k_warn(ab, "failed to update bcn tmpl during csa: %d\n",

				    ret);



		ret = ath11k_wmi_vdev_up(arvif->ar, arvif->vdev_id, arvif->aid,

					 arvif->bssid);

		if (ret) {