Accoding to the comment of struct wpa_driver_mesh_bss_params, the
max_peer_links parameter should be under the struct.
Signed-off-by: Masashi Honma <masashi.honma@xxxxxxxxx>
---
src/drivers/driver.h | 2 +-
src/drivers/driver_nl80211.c | 2 +-
wpa_supplicant/mesh.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 671a4b8..3e59e6e 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -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 {
@@ -1135,7 +1136,6 @@ struct wpa_driver_mesh_join_params {
int ie_len;
struct hostapd_freq_params freq;
int beacon_int;
- 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
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index b2b27a7..efbf819 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -8428,7 +8428,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;
/*
diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c
index dd534d4..7d42d4a 100644
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
@@ -400,7 +400,7 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s,
params.beacon_int = ssid->beacon_int;
else if (wpa_s->conf->beacon_int > 0)
params.beacon_int = wpa_s->conf->beacon_int;
- 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;
--
2.7.4
_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap
