@@ -3462,6 +3462,8 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
data->ch_switch.ch_width,
data->ch_switch.cf1,
data->ch_switch.cf2);
+
+ wpas_p2p_update_channel_list(wpa_s, WPAS_P2P_CHANNEL_UPDATE_CS);
break;
#ifdef NEED_AP_MLME
case EVENT_DFS_RADAR_DETECTED:
@@ -8664,6 +8664,13 @@ static void wpas_p2p_move_go(void *eloop_ctx, void *timeout_ctx)
wpas_p2p_go_update_common_freqs(wpa_s);
+ /* don't move go in the middle of csa */
+ if (hostapd_csa_in_progress(wpa_s->ap_iface)) {
+ wpa_printf(MSG_DEBUG,
+ "P2P: CSA is in progress - not moving GO");
+ return;
+ }
+
/*
* First, try a channel switch flow. If it is not supported or fails,
* take down the GO and bring it up again.
@@ -8774,6 +8781,16 @@ static void wpas_p2p_consider_moving_one_go(struct wpa_supplicant *wpa_s,
return;
}
+ /*
+ * Don't consider moving GO if it is in the middle of a CSA. When the
+ * CSA is finished this flow should be retriggered.
+ */
+ if (hostapd_csa_in_progress(wpa_s->ap_iface)) {
+ wpa_dbg(wpa_s, MSG_DEBUG,
+ "Not initiating a GO frequency change - CSA is in progress");
+ return;
+ }
+
if (invalid_freq && !wpas_p2p_disallowed_freq(wpa_s->global, freq))
timeout = P2P_GO_FREQ_CHANGE_TIME;
else