jeltz
/
hostap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mesh: Rename IE field to clarify its use 

This is used only for RSNE.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
This commit is contained in:
Masashi Honma 2015-08-31 16:58:09 +09:00 committed by Jouni Malinen
parent faf427645a
commit 8a51dcbc2f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ap/ap_config.h
View File

@ -33,8 +33,8 @@ struct mesh_conf {
u8 mesh_sp_id; u8 mesh_sp_id;
/* Authentication Protocol Identifier */ /* Authentication Protocol Identifier */
u8 mesh_auth_id; u8 mesh_auth_id;
u8 *ies; u8 *rsn_ie;
int ie_len; int rsn_ie_len;
#define MESH_CONF_SEC_NONE BIT(0) #define MESH_CONF_SEC_NONE BIT(0)
#define MESH_CONF_SEC_AUTH BIT(1) #define MESH_CONF_SEC_AUTH BIT(1)
#define MESH_CONF_SEC_AMPE BIT(2) #define MESH_CONF_SEC_AMPE BIT(2)

8
wpa_supplicant/mesh.c
View File

@ -47,8 +47,8 @@ void wpa_supplicant_mesh_iface_deinit(struct wpa_supplicant *wpa_s,
if (ifmsh->mconf) { if (ifmsh->mconf) {
mesh_mpm_deinit(wpa_s, ifmsh); mesh_mpm_deinit(wpa_s, ifmsh);
if (ifmsh->mconf->ies) { if (ifmsh->mconf->rsn_ie) {
ifmsh->mconf->ies = NULL; ifmsh->mconf->rsn_ie = NULL;
/* We cannot free this struct /* We cannot free this struct
* because wpa_authenticator on * because wpa_authenticator on
* hostapd side is also using it * hostapd side is also using it
@ -352,8 +352,8 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s,
} }
if (wpa_s->ifmsh) { if (wpa_s->ifmsh) {
params.ies = wpa_s->ifmsh->mconf->ies; params.ies = wpa_s->ifmsh->mconf->rsn_ie;
params.ie_len = wpa_s->ifmsh->mconf->ie_len; params.ie_len = wpa_s->ifmsh->mconf->rsn_ie_len;
params.basic_rates = wpa_s->ifmsh->basic_rates; params.basic_rates = wpa_s->ifmsh->basic_rates;
} }

4
wpa_supplicant/mesh_rsn.c
View File

@ -215,8 +215,8 @@ struct mesh_rsn *mesh_rsn_auth_init(struct wpa_supplicant *wpa_s,
bss->wpa_auth = mesh_rsn->auth; bss->wpa_auth = mesh_rsn->auth;
ie = wpa_auth_get_wpa_ie(mesh_rsn->auth, &ie_len); ie = wpa_auth_get_wpa_ie(mesh_rsn->auth, &ie_len);
conf->ies = (u8 *) ie; conf->rsn_ie = (u8 *) ie;
conf->ie_len = ie_len; conf->rsn_ie_len = ie_len;
wpa_supplicant_rsn_supp_set_config(wpa_s, wpa_s->current_ssid); wpa_supplicant_rsn_supp_set_config(wpa_s, wpa_s->current_ssid);