commit f1c9764c0e022457636216594483865aea6a1286
author Hai Shalom <haishalom@google.com> Fri Jul 19 23:42:07 2019 +0000
committer Hai Shalom <haishalom@google.com> Fri Jul 19 23:44:14 2019 +0000
tree bf7b681326e75e2b07f49d2a2ccbee39bea7ded9
parent 878cf7bcbf2d7d8f08c3d060b8c5fbfcf0743eda

Revert "[wpa_supplicant] Cumulative patch from b8491ae5a"

This reverts commit 878cf7bcbf2d7d8f08c3d060b8c5fbfcf0743eda.

Reason for revert: git_master/sdk_phone_armv7-sdk

Change-Id: I6070fc5c1f9c20867f6dfce90e529e35578d572e

wpa_supplicant/interworking.c

diff --git a/wpa_supplicant/interworking.c b/wpa_supplicant/interworking.c
index dabde82..c66a09b 100644
--- a/wpa_supplicant/interworking.c
+++ b/wpa_supplicant/interworking.c
@@ -1388,9 +1388,6 @@
 		    cred->num_roaming_consortiums == 0)
 			continue;
 
-		if (!cred->eap_method)
-			continue;
-
 		if ((cred->roaming_consortium_len == 0 ||
 		     !roaming_consortium_match(ie, anqp,
 					       cred->roaming_consortium,
@@ -2672,8 +2669,7 @@
 			found++;
 			bss->flags |= WPA_BSS_ANQP_FETCH_TRIED;
 			wpa_msg(wpa_s, MSG_INFO, "Starting ANQP fetch for "
-				MACSTR " (HESSID " MACSTR ")",
-				MAC2STR(bss->bssid), MAC2STR(bss->hessid));
+				MACSTR, MAC2STR(bss->bssid));
 			interworking_anqp_send_req(wpa_s, bss);
 			break;
 		}