commit 888d60bb21ed42b08afbdb2ca535f2918b6c45c2
author Xin Li <delphij@google.com> Tue Jun 27 01:14:05 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 27 01:14:05 2023 +0000
tree fc922e7b36a1dc2755a2e4efba0d61e42e58dba6
parent 09753a9a8add0048d2a04c2d448d5d1625e39a56
parent 114dc9e9614bf09a9cf1f4f22bf4878c8fbb7a1c

[automerger skipped] Merge Android 13 QPR3 am: 02005a6cfe -s ours am: 26fa96fa10 -s ours am: 9efb51ac4b -s ours am: 114dc9e961 -s ours

am skip reason: Merged-In Ia0d18db0dd5e9ef7d8ddff553e11cbd216a13b4d with SHA-1 c1d7467b83 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/2635397

Change-Id: Ie24d705d8acf07a92a55a9788d3b47c7f78e6104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

wpa_supplicant/events.c

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 253f87d..0909961 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -3889,6 +3889,7 @@
 			 * EVENT_PORT_AUTHORIZED handler when the driver is done
 			 * with the 4-way handshake.
 			 */
+			wpa_supplicant_set_state(wpa_s, WPA_4WAY_HANDSHAKE);
 			wpa_msg(wpa_s, MSG_INFO,
 				"ASSOC INFO: wait for driver port authorized indication");
 		}
@@ -5020,7 +5021,7 @@
 
 static void wpa_supplicant_event_port_authorized(struct wpa_supplicant *wpa_s)
 {
-	if (wpa_s->wpa_state == WPA_ASSOCIATED) {
+	if (wpa_s->wpa_state >= WPA_ASSOCIATED) {
 		wpa_supplicant_cancel_auth_timeout(wpa_s);
 		wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
 		eapol_sm_notify_portValid(wpa_s->eapol, true);