mesh: Move max_peer_links parameter to appropriate struct

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>

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index cf49847..4dd731f 100644 (file)
--- 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;
         */
        unsigned int flags;
        int peer_link_timeout;

+       int max_peer_links;

 };
 
 struct wpa_driver_mesh_join_params {
 };
 
 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;
        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
        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 61e641e..f27b149 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -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,
            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;
 
        /*
                goto fail;
 
        /*

diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c
index cdfe51c..e3d9d62 100644 (file)
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
@@ -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.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;
 
        if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) {
                params.flags |= WPA_DRIVER_MESH_FLAG_SAE_AUTH;