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

Allow hostapd/config.h and wpa_supplicant/config_ssid.h coexist

Browse source 
Move the shared IEEE 802.11w enum definition into src/common/defs.h to
avoid redefinition when both configuration structures are included into
the same file.
This commit is contained in:
Jouni Malinen 2009-03-26 16:06:15 +02:00 committed by Jouni Malinen
parent bfd67fc44c
commit c746331b52
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hostapd/config.h
View file

@ -205,11 +205,7 @@ struct hostapd_bss_config {
int wpa; /* bitfield of WPA_PROTO_WPA, WPA_PROTO_RSN */ int wpa; /* bitfield of WPA_PROTO_WPA, WPA_PROTO_RSN */
int wpa_key_mgmt; int wpa_key_mgmt;
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
enum { enum mfp_options ieee80211w;
NO_IEEE80211W = 0,
IEEE80211W_OPTIONAL = 1,
IEEE80211W_REQUIRED = 2
} ieee80211w;
/* dot11AssociationSAQueryMaximumTimeout (in TUs) */ /* dot11AssociationSAQueryMaximumTimeout (in TUs) */
unsigned int assoc_sa_query_max_timeout; unsigned int assoc_sa_query_max_timeout;
/* dot11AssociationSAQueryRetryTimeout (in TUs) */ /* dot11AssociationSAQueryRetryTimeout (in TUs) */

7
src/common/defs.h
View file

@ -206,4 +206,11 @@ typedef enum {
#define MLME_SETPROTECTION_KEY_TYPE_GROUP 0 #define MLME_SETPROTECTION_KEY_TYPE_GROUP 0
#define MLME_SETPROTECTION_KEY_TYPE_PAIRWISE 1 #define MLME_SETPROTECTION_KEY_TYPE_PAIRWISE 1
enum mfp_options {
NO_IEEE80211W = 0,
IEEE80211W_OPTIONAL = 1,
IEEE80211W_REQUIRED = 2
};
#endif /* DEFS_H */ #endif /* DEFS_H */

6
wpa_supplicant/config_ssid.h
View file

@ -318,11 +318,7 @@ struct wpa_ssid {
* This value is used to configure policy for management frame * This value is used to configure policy for management frame
* protection (IEEE 802.11w). 0 = disabled, 1 = optional, 2 = required. * protection (IEEE 802.11w). 0 = disabled, 1 = optional, 2 = required.
*/ */
enum { enum mfp_options ieee80211w;
NO_IEEE80211W = 0,
IEEE80211W_OPTIONAL = 1,
IEEE80211W_REQUIRED = 2
} ieee80211w;
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */
/** /**