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/hs20_supplicant.c b/wpa_supplicant/hs20_supplicant.c
index e81fef1..814d18e 100644
--- a/wpa_supplicant/hs20_supplicant.c
+++ b/wpa_supplicant/hs20_supplicant.c
@@ -96,7 +96,8 @@
return;
}
- if (wpa_bss_ext_capab(bss, WLAN_EXT_CAPAB_PROXY_ARP))
+ /* Check if Proxy ARP is enabled (2nd byte in the IE) */
+ if (ext_capa[3] & BIT(4))
filter |= WPA_DATA_FRAME_FILTER_FLAG_ARP |
WPA_DATA_FRAME_FILTER_FLAG_NA;
@@ -104,22 +105,15 @@
}
-void wpas_hs20_add_indication(struct wpabuf *buf, int pps_mo_id, int ap_release)
+void wpas_hs20_add_indication(struct wpabuf *buf, int pps_mo_id)
{
- int release;
u8 conf;
- release = (HS20_VERSION >> 4) + 1;
- if (ap_release > 0 && release > ap_release)
- release = ap_release;
- if (release < 2)
- pps_mo_id = -1;
-
wpabuf_put_u8(buf, WLAN_EID_VENDOR_SPECIFIC);
wpabuf_put_u8(buf, pps_mo_id >= 0 ? 7 : 5);
wpabuf_put_be24(buf, OUI_WFA);
wpabuf_put_u8(buf, HS20_INDICATION_OUI_TYPE);
- conf = (release - 1) << 4;
+ conf = HS20_VERSION;
if (pps_mo_id >= 0)
conf |= HS20_PPS_MO_ID_PRESENT;
wpabuf_put_u8(buf, conf);
@@ -144,21 +138,6 @@
}
-int get_hs20_version(struct wpa_bss *bss)
-{
- const u8 *ie;
-
- if (!bss)
- return 0;
-
- ie = wpa_bss_get_vendor_ie(bss, HS20_IE_VENDOR_TYPE);
- if (!ie || ie[1] < 5)
- return 0;
-
- return ((ie[6] >> 4) & 0x0f) + 1;
-}
-
-
int is_hs20_network(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid,
struct wpa_bss *bss)
{
@@ -432,7 +411,7 @@
return;
}
- if (lchown(fname, statbuf.st_uid, statbuf.st_gid) < 0) {
+ if (chown(fname, statbuf.st_uid, statbuf.st_gid) < 0) {
wpa_printf(MSG_WARNING, "Cannot change the ownership for %s",
fname);
}