Revert "[wpa_supplicant] Cumulative patch from c4e90da6d"
This reverts commit 39bc25d3a79c1375de430a7918d949c1a86f70c6.
Test: Compilation
Change-Id: Iae7670429466958911b5296cb1359bceecc0b03e
Exempt-From-Owner-Approval: Revert since it's breaking the build
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index 727c49a..ee39e0c 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -581,8 +581,8 @@
#endif /* CONFIG_WPS */
#ifdef CONFIG_HS20
- if (wpa_s->conf->hs20 && wpabuf_resize(&extra_ie, 9) == 0)
- wpas_hs20_add_indication(extra_ie, -1, 0);
+ if (wpa_s->conf->hs20 && wpabuf_resize(&extra_ie, 7) == 0)
+ wpas_hs20_add_indication(extra_ie, -1);
#endif /* CONFIG_HS20 */
#ifdef CONFIG_FST
@@ -2806,13 +2806,6 @@
{
u8 *tmp = NULL;
- if ((wpa_s->mac_addr_rand_supported & type) != type ) {
- wpa_printf(MSG_INFO,
- "scan: MAC randomization type %u != supported=%u",
- type, wpa_s->mac_addr_rand_supported);
- return -1;
- }
-
wpas_mac_addr_rand_scan_clear(wpa_s, type);
if (addr) {