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

mesh: Move max_peer_links parameter to appropriate struct

Browse source 
Accoding to the comment of struct wpa_driver_mesh_bss_params, the
max_peer_links parameter should be under that struct.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
This commit is contained in:
Masashi Honma 2016-08-05 17:35:28 +09:00 committed by Jouni Malinen
parent 548d280162
commit a1431ef8df
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/drivers/driver.h
View file

@ -1125,6 +1125,7 @@ struct wpa_driver_mesh_bss_params {
*/
unsigned int flags;
int peer_link_timeout;
int max_peer_links;
};
struct wpa_driver_mesh_join_params {
@ -1136,7 +1137,6 @@ struct wpa_driver_mesh_join_params {
struct hostapd_freq_params freq;
int beacon_int;
int dtim_period;
int max_peer_links;
struct wpa_driver_mesh_bss_params conf;
#define WPA_DRIVER_MESH_FLAG_USER_MPM 0x00000001
#define WPA_DRIVER_MESH_FLAG_DRIVER_MPM 0x00000002

2
src/drivers/driver_nl80211.c
View file

@ -8465,7 +8465,7 @@ static int nl80211_join_mesh(struct i802_bss *bss,
nla_put_u32(msg, NL80211_MESHCONF_AUTO_OPEN_PLINKS, 0))
goto fail;
if (nla_put_u16(msg, NL80211_MESHCONF_MAX_PEER_LINKS,
params->max_peer_links))
params->conf.max_peer_links))
goto fail;
/*

2
wpa_supplicant/mesh.c
View file

@ -404,7 +404,7 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s,
params.dtim_period = ssid->dtim_period;
else if (wpa_s->conf->dtim_period > 0)
params.dtim_period = wpa_s->conf->dtim_period;
params.max_peer_links = wpa_s->conf->max_peer_links;
params.conf.max_peer_links = wpa_s->conf->max_peer_links;
if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) {
params.flags |= WPA_DRIVER_MESH_FLAG_SAE_AUTH;