| Message ID | 1490856826-4401-1-git-send-email-masashi.honma@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
On Thu, Mar 30, 2017 at 03:53:45PM +0900, Masashi Honma wrote: > On some practical cases, it is useful to suppress joining to node in the > distance. The new field mesh_rssi_threshold could be used as RSSI > threshold for joining. > diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c > @@ -8774,7 +8774,9 @@ static int nl80211_put_mesh_config(struct nl_msg *msg, > params->auto_plinks)) || > ((params->flags & WPA_DRIVER_MESH_CONF_FLAG_MAX_PEER_LINKS) && > nla_put_u16(msg, NL80211_MESHCONF_MAX_PEER_LINKS, > - params->max_peer_links))) > + params->max_peer_links)) || > + (nla_put_u32(msg, NL80211_MESHCONF_RSSI_THRESHOLD, > + params->rssi_threshold))) > return -1; So this is going the opposite direction of what I was thinking of, i.e., hardcoding NL80211_MESHCONF_RSSI_THRESHOLD to be set regardless of whether this was configured in wpa_supplicant. Do we really want to do this instead of leaving the kernel to use its default value if the new mesh_rssi_threshold parameter is not explicitly set?
On 2017/04/01 17:45, Jouni Malinen wrote: > So this is going the opposite direction of what I was thinking of, i.e., > hardcoding NL80211_MESHCONF_RSSI_THRESHOLD to be set regardless of > whether this was configured in wpa_supplicant. Do we really want to do > this instead of leaving the kernel to use its default value if the new > mesh_rssi_threshold parameter is not explicitly set? Sorry, I mis-understood your comment. I already sent PATCH v3. Could you review it ? Masashi Honma.
diff --git a/src/drivers/driver.h b/src/drivers/driver.h index fc2593e..c180ea3 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -1296,6 +1296,7 @@ struct wpa_driver_mesh_bss_params { int auto_plinks; int peer_link_timeout; int max_peer_links; + int rssi_threshold; u16 ht_opmode; }; diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index bceeba2..c836777 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -8774,7 +8774,9 @@ static int nl80211_put_mesh_config(struct nl_msg *msg, params->auto_plinks)) || ((params->flags & WPA_DRIVER_MESH_CONF_FLAG_MAX_PEER_LINKS) && nla_put_u16(msg, NL80211_MESHCONF_MAX_PEER_LINKS, - params->max_peer_links))) + params->max_peer_links)) || + (nla_put_u32(msg, NL80211_MESHCONF_RSSI_THRESHOLD, + params->rssi_threshold))) return -1; /* diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index 8bfb6a1..a0b8861 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -2066,6 +2066,7 @@ static const struct parse_data ssid_fields[] = { #ifdef CONFIG_MESH { INT_RANGE(mode, 0, 5) }, { INT_RANGE(no_auto_peer, 0, 1) }, + { INT_RANGE(mesh_rssi_threshold, -255, 0) }, #else /* CONFIG_MESH */ { INT_RANGE(mode, 0, 4) }, #endif /* CONFIG_MESH */ @@ -2598,6 +2599,7 @@ void wpa_config_set_network_defaults(struct wpa_ssid *ssid) ssid->dot11MeshRetryTimeout = DEFAULT_MESH_RETRY_TIMEOUT; ssid->dot11MeshConfirmTimeout = DEFAULT_MESH_CONFIRM_TIMEOUT; ssid->dot11MeshHoldingTimeout = DEFAULT_MESH_HOLDING_TIMEOUT; + ssid->mesh_rssi_threshold = DEFAULT_MESH_RSSI_THRESHOLD; #endif /* CONFIG_MESH */ #ifdef CONFIG_HT_OVERRIDES ssid->disable_ht = DEFAULT_DISABLE_HT; diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c index e8f1149..f6732e4 100644 --- a/wpa_supplicant/config_file.c +++ b/wpa_supplicant/config_file.c @@ -783,6 +783,7 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid) #endif /* IEEE8021X_EAPOL */ INT(mode); INT(no_auto_peer); + INT(mesh_rssi_threshold); INT(frequency); INT(fixed_freq); #ifdef CONFIG_ACS diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h index 869165c..04a0a9a 100644 --- a/wpa_supplicant/config_ssid.h +++ b/wpa_supplicant/config_ssid.h @@ -28,6 +28,7 @@ #define DEFAULT_MESH_RETRY_TIMEOUT 40 #define DEFAULT_MESH_CONFIRM_TIMEOUT 40 #define DEFAULT_MESH_HOLDING_TIMEOUT 40 +#define DEFAULT_MESH_RSSI_THRESHOLD 0 #define DEFAULT_DISABLE_HT 0 #define DEFAULT_DISABLE_HT40 0 #define DEFAULT_DISABLE_SGI 0 @@ -807,6 +808,13 @@ struct wpa_ssid { */ int no_auto_peer; +#ifdef CONFIG_MESH + /** + * mesh_rssi_threshold - Set mesh parameter mesh_rssi_threshold(dBm) + */ + int mesh_rssi_threshold; +#endif /* CONFIG_MESH */ + /** * wps_disabled - WPS disabled in AP mode * diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 01b657e..0619599 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -413,6 +413,7 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, else if (wpa_s->conf->dtim_period > 0) params.dtim_period = wpa_s->conf->dtim_period; params.conf.max_peer_links = wpa_s->conf->max_peer_links; + params.conf.rssi_threshold = ssid->mesh_rssi_threshold; if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) { params.flags |= WPA_DRIVER_MESH_FLAG_SAE_AUTH; diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c index c5091b5..8278bd2 100644 --- a/wpa_supplicant/wpa_cli.c +++ b/wpa_supplicant/wpa_cli.c @@ -1392,7 +1392,7 @@ static const char *network_fields[] = { "eap_workaround", "pac_file", "fragment_size", "ocsp", #endif /* IEEE8021X_EAPOL */ #ifdef CONFIG_MESH - "mode", "no_auto_peer", + "mode", "no_auto_peer", "mesh_rssi_threshold", #else /* CONFIG_MESH */ "mode", #endif /* CONFIG_MESH */
On some practical cases, it is useful to suppress joining to node in the distance. The new field mesh_rssi_threshold could be used as RSSI threshold for joining. Signed-off-by: Masashi Honma <masashi.honma@gmail.com> --- src/drivers/driver.h | 1 + src/drivers/driver_nl80211.c | 4 +++- wpa_supplicant/config.c | 2 ++ wpa_supplicant/config_file.c | 1 + wpa_supplicant/config_ssid.h | 8 ++++++++ wpa_supplicant/mesh.c | 1 + wpa_supplicant/wpa_cli.c | 2 +- 7 files changed, 17 insertions(+), 2 deletions(-)