aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-11-29 10:44:02 (GMT)
committerJouni Malinen <j@w1.fi>2008-11-29 10:44:02 (GMT)
commitc0d041d9a7518240ab2e829d6f4f1b1b2c3eb8cd (patch)
tree0d7209f0cf3ba851813314311a75d9ddbd1f43c1 /wpa_supplicant
parent7d7c918d9725b7622e50084459f3f382f50618ac (diff)
downloadhostap-06-c0d041d9a7518240ab2e829d6f4f1b1b2c3eb8cd.zip
hostap-06-c0d041d9a7518240ab2e829d6f4f1b1b2c3eb8cd.tar.gz
hostap-06-c0d041d9a7518240ab2e829d6f4f1b1b2c3eb8cd.tar.bz2
WPS: Moved ProbeReq/AssocReq WPS IE building into wps_common.c
This code and the related attributes are not specific to Enrollee functionality, so wps_common.c is the correct location for them.
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/scan.c5
-rw-r--r--wpa_supplicant/wpa_supplicant.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index fb64ca5..0811d67 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -175,9 +175,8 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
#ifdef CONFIG_WPS
if (wps) {
- wps_ie = wps_enrollee_build_probe_req_ie(wps == 2,
- &wpa_s->wps->dev,
- wpa_s->conf->uuid);
+ wps_ie = wps_build_probe_req_ie(wps == 2, &wpa_s->wps->dev,
+ wpa_s->conf->uuid);
if (wps_ie) {
extra_ie = wpabuf_head(wps_ie);
extra_ie_len = wpabuf_len(wps_ie);
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 4a26aae..ffe6729 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1012,7 +1012,7 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s,
}
#ifdef CONFIG_WPS
} else if (ssid->key_mgmt & WPA_KEY_MGMT_WPS) {
- struct wpabuf *wps_ie = wps_enrollee_build_assoc_req_ie();
+ struct wpabuf *wps_ie = wps_build_assoc_req_ie();
if (wps_ie && wpabuf_len(wps_ie) <= sizeof(wpa_ie)) {
wpa_ie_len = wpabuf_len(wps_ie);
os_memcpy(wpa_ie, wpabuf_head(wps_ie), wpa_ie_len);