commit eb6f695ab72a6dd55c2f7bce36345d881388a494
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jul 01 01:07:29 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jul 01 01:07:29 2021 +0000
tree c014d88ab84219a2e2d8dd835e9e6346852e2a35
parent 2ee98cc4f5e2c9e2e190b0269ff24974f6fd88ab
parent 236f0f571dbfa79146abe5879c56fe52a99d8564

Snap for 7510676 from 236f0f571dbfa79146abe5879c56fe52a99d8564 to sc-release

Change-Id: Ie016c0d94967d01d29a7e1a20c397df6caa4e2cf

wpa_supplicant/ap.c

diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index cfefa48..807e36d 100644
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -807,12 +807,17 @@
 		return;
 	}
 
+	if (wpa_s->current_ssid) {
+		int acs = 0;
 #ifdef CONFIG_ACS
-	if (wpa_s->current_ssid && wpa_s->current_ssid->acs) {
-		wpa_s->assoc_freq = wpa_s->ap_iface->freq;
-		wpa_s->current_ssid->frequency = wpa_s->ap_iface->freq;
+		acs = wpa_s->current_ssid->acs;
+#endif
+		if (acs || (wpa_s->assoc_freq && wpa_s->ap_iface->freq &&
+			    wpa_s->assoc_freq != wpa_s->ap_iface->freq)) {
+			wpa_s->assoc_freq = wpa_s->ap_iface->freq;
+			wpa_s->current_ssid->frequency = wpa_s->ap_iface->freq;
+		}
 	}
-#endif /* CONFIG_ACS */
 
 	wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);