aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasashi Honma <masashi.honma@gmail.com>2015-08-31 07:58:09 (GMT)
committerJouni Malinen <j@w1.fi>2015-09-05 18:15:53 (GMT)
commit8a51dcbc2f5a032963dd9aa947c1a50d1da307ee (patch)
treed9167fc5e78174146e1cb38d5e4a23b9e336f822
parentfaf427645aa79a32ebd8093ff676abfc9d36e951 (diff)
downloadhostap-8a51dcbc2f5a032963dd9aa947c1a50d1da307ee.zip
hostap-8a51dcbc2f5a032963dd9aa947c1a50d1da307ee.tar.gz
hostap-8a51dcbc2f5a032963dd9aa947c1a50d1da307ee.tar.bz2
mesh: Rename IE field to clarify its use
This is used only for RSNE. Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
-rw-r--r--src/ap/ap_config.h4
-rw-r--r--wpa_supplicant/mesh.c8
-rw-r--r--wpa_supplicant/mesh_rsn.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
index 5e83cdc..de470a9 100644
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -33,8 +33,8 @@ struct mesh_conf {
u8 mesh_sp_id;
/* Authentication Protocol Identifier */
u8 mesh_auth_id;
- u8 *ies;
- int ie_len;
+ u8 *rsn_ie;
+ int rsn_ie_len;
#define MESH_CONF_SEC_NONE BIT(0)
#define MESH_CONF_SEC_AUTH BIT(1)
#define MESH_CONF_SEC_AMPE BIT(2)
diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c
index ac0eb5c..77f708b 100644
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
@@ -47,8 +47,8 @@ void wpa_supplicant_mesh_iface_deinit(struct wpa_supplicant *wpa_s,
if (ifmsh->mconf) {
mesh_mpm_deinit(wpa_s, ifmsh);
- if (ifmsh->mconf->ies) {
- ifmsh->mconf->ies = NULL;
+ if (ifmsh->mconf->rsn_ie) {
+ ifmsh->mconf->rsn_ie = NULL;
/* We cannot free this struct
* because wpa_authenticator on
* hostapd side is also using it
@@ -352,8 +352,8 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s,
}
if (wpa_s->ifmsh) {
- params.ies = wpa_s->ifmsh->mconf->ies;
- params.ie_len = wpa_s->ifmsh->mconf->ie_len;
+ params.ies = wpa_s->ifmsh->mconf->rsn_ie;
+ params.ie_len = wpa_s->ifmsh->mconf->rsn_ie_len;
params.basic_rates = wpa_s->ifmsh->basic_rates;
}
diff --git a/wpa_supplicant/mesh_rsn.c b/wpa_supplicant/mesh_rsn.c
index 936002d..a140b97 100644
--- a/wpa_supplicant/mesh_rsn.c
+++ b/wpa_supplicant/mesh_rsn.c
@@ -215,8 +215,8 @@ struct mesh_rsn *mesh_rsn_auth_init(struct wpa_supplicant *wpa_s,
bss->wpa_auth = mesh_rsn->auth;
ie = wpa_auth_get_wpa_ie(mesh_rsn->auth, &ie_len);
- conf->ies = (u8 *) ie;
- conf->ie_len = ie_len;
+ conf->rsn_ie = (u8 *) ie;
+ conf->rsn_ie_len = ie_len;
wpa_supplicant_rsn_supp_set_config(wpa_s, wpa_s->current_ssid);