aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jouni@codeaurora.org>2019-10-07 12:23:38 (GMT)
committerJouni Malinen <j@w1.fi>2019-10-07 14:20:41 (GMT)
commitd6a7de60c8d11b3325953bb808ce0ddfd67e232c (patch)
treebd9194abb831c59a17bf1335d64f208ab71cf667
parent8b426ab1e738ea0f8eea9b76031ef39c352e45a5 (diff)
downloadhostap-d6a7de60c8d11b3325953bb808ce0ddfd67e232c.zip
hostap-d6a7de60c8d11b3325953bb808ce0ddfd67e232c.tar.gz
hostap-d6a7de60c8d11b3325953bb808ce0ddfd67e232c.tar.bz2
wpa_cli: Clean up unnecessarily complex CONFIG_MESH use
There is no need for #ifdef/#else/#endif construction in network_fields[] to cover "mode" (which is completely independent of CONFIG_MESH) or two separate conditional blocks for mesh related network fields, so move these into a single conditionally included block. Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
-rw-r--r--wpa_supplicant/wpa_cli.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index bfa64cb..47cec0b 100644
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -1427,15 +1427,12 @@ static const char *network_fields[] = {
#ifdef IEEE8021X_EAPOL
"eap_workaround", "pac_file", "fragment_size", "ocsp",
#endif /* IEEE8021X_EAPOL */
-#ifdef CONFIG_MESH
- "mode", "no_auto_peer", "mesh_rssi_threshold",
-#else /* CONFIG_MESH */
"mode",
-#endif /* CONFIG_MESH */
"proactive_key_caching", "disabled", "id_str",
"ieee80211w",
"mixed_cell", "frequency", "fixed_freq",
#ifdef CONFIG_MESH
+ "no_auto_peer", "mesh_rssi_threshold",
"mesh_basic_rates", "dot11MeshMaxRetries",
"dot11MeshRetryTimeout", "dot11MeshConfirmTimeout",
"dot11MeshHoldingTimeout",