--- a/ath10k-5.8/wmi.c
+++ b/ath10k-5.8/wmi.c
@@ -4254,7 +4254,7 @@ void ath10k_wmi_event_host_swba(struct a
 		 * actual channel switch is done
 		 */
 		if (arvif->vif->csa_active &&
-		    ieee80211_csa_is_complete(arvif->vif)) {
+		    ieee80211_beacon_cntdwn_is_complete(arvif->vif)) {
 			ieee80211_csa_finish(arvif->vif);
 			continue;
 		}
--- a/ath10k-5.8/mac.c
+++ b/ath10k-5.8/mac.c
@@ -2295,8 +2295,8 @@ static void ath10k_mac_vif_ap_csa_count_
 	if (!arvif->is_up)
 		return;
 
-	if (!ieee80211_csa_is_complete(vif)) {
-		ieee80211_csa_update_counter(vif);
+	if (!ieee80211_beacon_cntdwn_is_complete(vif)) {
+		ieee80211_beacon_update_cntdwn(vif);
 
 		ret = ath10k_mac_setup_bcn_tmpl(arvif);
 		if (ret)