Revert "[wpa_supplicant] Cumulative patch from commit 0c5ededed"
This reverts commit 1a1e642fd6c1200e7e1979ea70103c484062f3a9.
Reason for revert: Droidcop: Potential culprit for Bug 154881734 - verifying through Forrest before revert submission
Change-Id: I85f75adeb43554b0ebbf295fea51e1b68b169ed2
diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index 524a151..559bb87 100644
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -117,7 +117,7 @@
u8 buf[sizeof(struct ieee80211_mgmt) + 1024];
u8 *p = buf;
u16 reason = WLAN_REASON_UNSPECIFIED;
- int status = WLAN_STATUS_SUCCESS;
+ u16 status = WLAN_STATUS_SUCCESS;
const u8 *p2p_dev_addr = NULL;
if (addr == NULL) {
@@ -606,19 +606,17 @@
wpa_auth_sta_key_mgmt(sta->wpa_sm) == WPA_KEY_MGMT_OWE &&
elems.owe_dh) {
u8 *npos;
- u16 ret_status;
npos = owe_assoc_req_process(hapd, sta,
elems.owe_dh, elems.owe_dh_len,
p, sizeof(buf) - (p - buf),
- &ret_status);
- status = ret_status;
+ &status);
if (npos)
p = npos;
if (!npos &&
status == WLAN_STATUS_FINITE_CYCLIC_GROUP_NOT_SUPPORTED) {
- hostapd_sta_assoc(hapd, addr, reassoc, ret_status, buf,
+ hostapd_sta_assoc(hapd, addr, reassoc, status, buf,
p - buf);
return 0;
}
@@ -711,8 +709,7 @@
fail:
#ifdef CONFIG_IEEE80211R_AP
- if (status >= 0)
- hostapd_sta_assoc(hapd, addr, reassoc, status, buf, p - buf);
+ hostapd_sta_assoc(hapd, addr, reassoc, status, buf, p - buf);
#endif /* CONFIG_IEEE80211R_AP */
hostapd_drv_sta_disassoc(hapd, sta->addr, reason);
ap_free_sta(hapd, sta);