From d6a7de60c8d11b3325953bb808ce0ddfd67e232c Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 7 Oct 2019 15:23:38 +0300 Subject: [PATCH] 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 --- wpa_supplicant/wpa_cli.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c index bfa64cb9b..47cec0b10 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",