commit c0e7471ca0923ae7a6222ea63d68b5f172b9bbea
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon May 13 23:18:25 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon May 13 23:18:25 2024 +0000
tree ca5008da6226bd94d567528bdcd627130322c30a
parent c6fb14779ac3d9a6bb9459fe891038ee9bbea995
parent d7f8978af41fc59979eb4895f5b1ae1494cba0d2

Snap for 11834877 from d7f8978af41fc59979eb4895f5b1ae1494cba0d2 to 24Q3-release

Change-Id: I3865db456a19c6acc73adb0c4d5cc648cf4fb7fd

wpa_supplicant/wpa_supplicant.c

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 6e34e87..e40937c 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -4511,7 +4511,11 @@
 		eapol_sm_invalidate_cached_session(wpa_s->eapol);
 	}
 
-	if (!wpas_driver_bss_selection(wpa_s) || ssid->bssid_set) {
+	if (!wpas_driver_bss_selection(wpa_s) ||
+#ifdef CONFIG_P2P
+	    wpa_s->p2p_in_invitation ||
+#endif /* CONFIG_P2P */
+	    ssid->bssid_set) {
 		wpa_s->current_bss = bss;
 #ifdef CONFIG_HS20
 		hs20_configure_frame_filters(wpa_s);