aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/config_file.c
diff options
context:
space:
mode:
authorLior David <qca_liord@qca.qualcomm.com>2017-08-30 13:38:15 (GMT)
committerJouni Malinen <j@w1.fi>2017-09-12 14:17:21 (GMT)
commit30311339834bb9f426a36ad31b95860af130a4ae (patch)
tree4cb5cb5e7439319c6c5caa4c6d1190d746323885 /wpa_supplicant/config_file.c
parentf4ad8412b49e8571073b692fb32903c5f638824f (diff)
downloadhostap-30311339834bb9f426a36ad31b95860af130a4ae.zip
hostap-30311339834bb9f426a36ad31b95860af130a4ae.tar.gz
hostap-30311339834bb9f426a36ad31b95860af130a4ae.tar.bz2
mesh: Move writing of mesh_rssi_threshold inside CONFIG_MESH
Previously, the code that writes mesh_rssi_threshold to a network block always executes, but the code that reads it from network block and the code that initializes it to a default value in a new network block are inside #ifdef CONFIG_MESH. As a result when writing a config file it will write mesh_rssi_threshold (since it has a non-default value) and later fail to read the network block. Fix this by moving the write code under #ifdef CONFIG_MESH as well. Note, network blocks which already have mesh_rssi_threshold because of the bug will still fail to read after the fix. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
Diffstat (limited to 'wpa_supplicant/config_file.c')
-rw-r--r--wpa_supplicant/config_file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c
index 692b200..5ccd003 100644
--- a/wpa_supplicant/config_file.c
+++ b/wpa_supplicant/config_file.c
@@ -795,7 +795,6 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid)
#endif /* IEEE8021X_EAPOL */
INT(mode);
INT(no_auto_peer);
- INT_DEF(mesh_rssi_threshold, DEFAULT_MESH_RSSI_THRESHOLD);
INT(frequency);
INT(fixed_freq);
#ifdef CONFIG_ACS
@@ -845,6 +844,7 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid)
INT_DEF(dot11MeshRetryTimeout, DEFAULT_MESH_RETRY_TIMEOUT);
INT_DEF(dot11MeshConfirmTimeout, DEFAULT_MESH_CONFIRM_TIMEOUT);
INT_DEF(dot11MeshHoldingTimeout, DEFAULT_MESH_HOLDING_TIMEOUT);
+ INT_DEF(mesh_rssi_threshold, DEFAULT_MESH_RSSI_THRESHOLD);
#endif /* CONFIG_MESH */
INT(wpa_ptk_rekey);
INT(group_rekey);