From 64e37be9454cbbad2ae89f24ae3d1dcb668cc6df Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 24 Jul 2019 19:49:24 +0300 Subject: [PATCH] Avoid nested enum wpas_mode declaration to allow C++ compilation Move enum wpas_mode declaration to the global scope to avoid issues with the recently added inline function wpas_mode_to_ieee80211_mode() using it as an argument. This fixes C++ compilation issues with cases that include wpa_supplicant_i.h. Fixes: 3459c54ac78b ("mesh: Add support for HE mode") Signed-off-by: Jouni Malinen --- wpa_supplicant/config_ssid.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h index 37b818395..d5c5c00a9 100644 --- a/wpa_supplicant/config_ssid.h +++ b/wpa_supplicant/config_ssid.h @@ -48,6 +48,15 @@ struct psk_list_entry { u8 p2p; }; +enum wpas_mode { + WPAS_MODE_INFRA = 0, + WPAS_MODE_IBSS = 1, + WPAS_MODE_AP = 2, + WPAS_MODE_P2P_GO = 3, + WPAS_MODE_P2P_GROUP_FORMATION = 4, + WPAS_MODE_MESH = 5, +}; + /** * struct wpa_ssid - Network configuration data * @@ -394,14 +403,7 @@ struct wpa_ssid { * CCMP, but not both), and psk must also be set (either directly or * using ASCII passphrase). */ - enum wpas_mode { - WPAS_MODE_INFRA = 0, - WPAS_MODE_IBSS = 1, - WPAS_MODE_AP = 2, - WPAS_MODE_P2P_GO = 3, - WPAS_MODE_P2P_GROUP_FORMATION = 4, - WPAS_MODE_MESH = 5, - } mode; + enum wpas_mode mode; /** * pbss - Whether to use PBSS. Relevant to DMG networks only.