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

Avoid nested enum wpas_mode declaration to allow C++ compilation

Browse source 
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: 3459c54ac7 ("mesh: Add support for HE mode")
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2019-07-24 19:49:24 +03:00 committed by Jouni Malinen
parent fe2e1edf43
commit 64e37be945
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
wpa_supplicant/config_ssid.h
View file

@ -48,6 +48,15 @@ struct psk_list_entry {
u8 p2p; 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 * 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 * CCMP, but not both), and psk must also be set (either directly or
* using ASCII passphrase). * using ASCII passphrase).
*/ */
enum wpas_mode { enum wpas_mode 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;
/** /**
* pbss - Whether to use PBSS. Relevant to DMG networks only. * pbss - Whether to use PBSS. Relevant to DMG networks only.