commit 878cf7bcbf2d7d8f08c3d060b8c5fbfcf0743eda
author Hai Shalom <haishalom@google.com> Mon Jul 15 14:55:18 2019 -0700
committer Hai Shalom <haishalom@google.com> Fri Jul 19 20:14:50 2019 +0000
tree 586feddefcf9b50bcb0f9044ec9d63d87d4c70e8
parent 2815853a63db48fa1aa9469ff1adebae6435fa63

[wpa_supplicant] Cumulative patch from b8491ae5a

Also revert local solution for encrypted IMSI and use the upstream version.

Bug: 134177972
Test: Device boots up and connects to WPA3/OWE wifi networks, run traffic.
Test: Able to turn on/off softap, associate wifi STA, run traffic.
Test: Regression test passed (Bug: 137653009)
Change-Id: Ibf6b6ef3495287156c397daa89d02923f981889b

wpa_supplicant/preauth_test.c

diff --git a/wpa_supplicant/preauth_test.c b/wpa_supplicant/preauth_test.c
index f2fff55..3f2da34 100644
--- a/wpa_supplicant/preauth_test.c
+++ b/wpa_supplicant/preauth_test.c
@@ -35,7 +35,7 @@
 };
 
 
-static void _wpa_supplicant_deauthenticate(void *wpa_s, int reason_code)
+static void _wpa_supplicant_deauthenticate(void *wpa_s, u16 reason_code)
 {
 	wpa_supplicant_deauthenticate(wpa_s, reason_code);
 }