From 79ce2d519b4371781f9bd78e29bb75f5193325d3 Mon Sep 17 00:00:00 2001 From: Ashok Ponnaiah Date: Tue, 6 Feb 2018 20:27:41 +0200 Subject: [PATCH] OWE: Rename function to match use (driver-SME/MLME) This function is used to process a (Re)Association Request frame, so rename it appropriately to mention assoc_req instead of auth_req. Signed-off-by: Ashok Ponnaiah --- src/ap/drv_callbacks.c | 8 ++++---- src/ap/ieee802_11.c | 6 +++--- src/ap/ieee802_11.h | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c index cb9617154..e4a458107 100644 --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c @@ -528,10 +528,10 @@ skip_wpa_check: elems.owe_dh) { u8 *npos; - npos = owe_auth_req_process(hapd, sta, - elems.owe_dh, elems.owe_dh_len, - p, sizeof(buf) - (p - buf), - &reason); + npos = owe_assoc_req_process(hapd, sta, + elems.owe_dh, elems.owe_dh_len, + p, sizeof(buf) - (p - buf), + &reason); if (npos) p = npos; if (!npos && diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c index 1e89fbae0..38487a883 100644 --- a/src/ap/ieee802_11.c +++ b/src/ap/ieee802_11.c @@ -2988,9 +2988,9 @@ done: #ifdef CONFIG_OWE -u8 * owe_auth_req_process(struct hostapd_data *hapd, struct sta_info *sta, - const u8 *owe_dh, u8 owe_dh_len, - u8 *owe_buf, size_t owe_buf_len, u16 *reason) +u8 * owe_assoc_req_process(struct hostapd_data *hapd, struct sta_info *sta, + const u8 *owe_dh, u8 owe_dh_len, + u8 *owe_buf, size_t owe_buf_len, u16 *reason) { if (wpa_auth_sta_get_pmksa(sta->wpa_sm)) { wpa_printf(MSG_DEBUG, "OWE: Using PMKSA caching"); diff --git a/src/ap/ieee802_11.h b/src/ap/ieee802_11.h index a263efeda..9fa09ca41 100644 --- a/src/ap/ieee802_11.h +++ b/src/ap/ieee802_11.h @@ -142,9 +142,9 @@ void ieee802_11_finish_fils_auth(struct hostapd_data *hapd, struct sta_info *sta, int success, struct wpabuf *erp_resp, const u8 *msk, size_t msk_len); -u8 * owe_auth_req_process(struct hostapd_data *hapd, struct sta_info *sta, - const u8 *owe_dh, u8 owe_dh_len, - u8 *owe_buf, size_t owe_buf_len, u16 *reason); +u8 * owe_assoc_req_process(struct hostapd_data *hapd, struct sta_info *sta, + const u8 *owe_dh, u8 owe_dh_len, + u8 *owe_buf, size_t owe_buf_len, u16 *reason); void fils_hlp_timeout(void *eloop_ctx, void *eloop_data); void fils_hlp_finish_assoc(struct hostapd_data *hapd, struct sta_info *sta); void handle_auth_fils(struct hostapd_data *hapd, struct sta_info *sta,