jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wpa_cli: Clean up unnecessarily complex CONFIG_MESH use

Browse source 
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>
This commit is contained in:
Jouni Malinen 2019-10-07 15:23:38 +03:00 committed by Jouni Malinen
parent 8b426ab1e7
commit d6a7de60c8
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
wpa_supplicant/wpa_cli.c
View file

@ -1427,15 +1427,12 @@ static const char *network_fields[] = {
#ifdef IEEE8021X_EAPOL #ifdef IEEE8021X_EAPOL
"eap_workaround", "pac_file", "fragment_size", "ocsp", "eap_workaround", "pac_file", "fragment_size", "ocsp",
#endif /* IEEE8021X_EAPOL */ #endif /* IEEE8021X_EAPOL */
#ifdef CONFIG_MESH
"mode", "no_auto_peer", "mesh_rssi_threshold",
#else /* CONFIG_MESH */
"mode", "mode",
#endif /* CONFIG_MESH */
"proactive_key_caching", "disabled", "id_str", "proactive_key_caching", "disabled", "id_str",
"ieee80211w", "ieee80211w",
"mixed_cell", "frequency", "fixed_freq", "mixed_cell", "frequency", "fixed_freq",
#ifdef CONFIG_MESH #ifdef CONFIG_MESH
"no_auto_peer", "mesh_rssi_threshold",
"mesh_basic_rates", "dot11MeshMaxRetries", "mesh_basic_rates", "dot11MeshMaxRetries",
"dot11MeshRetryTimeout", "dot11MeshConfirmTimeout", "dot11MeshRetryTimeout", "dot11MeshConfirmTimeout",
"dot11MeshHoldingTimeout", "dot11MeshHoldingTimeout",