Share same hw_feature definitions between hostapd and wpa_supplicant

[wpasupplicant] / hostapd / config.h

diff --git a/hostapd/config.h b/hostapd/config.h
index ea530d4..6d41740 100644 (file)
--- a/hostapd/config.h
+++ b/hostapd/config.h
@@ -205,11 +205,7 @@ struct hostapd_bss_config {
        int wpa; /* bitfield of WPA_PROTO_WPA, WPA_PROTO_RSN */
        int wpa_key_mgmt;
 #ifdef CONFIG_IEEE80211W
-       enum {
-               NO_IEEE80211W = 0,
-               IEEE80211W_OPTIONAL = 1,
-               IEEE80211W_REQUIRED = 2
-       } ieee80211w;
+       enum mfp_options ieee80211w;
        /* dot11AssociationSAQueryMaximumTimeout (in TUs) */
        unsigned int assoc_sa_query_max_timeout;
        /* dot11AssociationSAQueryRetryTimeout (in TUs) */
@@ -316,14 +312,6 @@ struct hostapd_bss_config {
 };
 
 
-typedef enum {
-       HOSTAPD_MODE_IEEE80211B,
-       HOSTAPD_MODE_IEEE80211G,
-       HOSTAPD_MODE_IEEE80211A,
-       NUM_HOSTAPD_MODES
-} hostapd_hw_mode;
-
-
 /**
  * struct hostapd_config - Per-radio interface configuration
  */
@@ -351,7 +339,7 @@ struct hostapd_config {
        int *supported_rates;
        int *basic_rates;
 
-       const struct wpa_driver_ops *driver;
+       const struct hapd_driver_ops *driver;
 
        int passive_scan_interval; /* seconds, 0 = disabled */
        int passive_scan_listen; /* usec */
@@ -396,6 +384,7 @@ struct hostapd_config {
 
 int hostapd_mac_comp(const void *a, const void *b);
 int hostapd_mac_comp_empty(const void *a);
+struct hostapd_config * hostapd_config_defaults(void);
 struct hostapd_config * hostapd_config_read(const char *fname);
 void hostapd_config_free(struct hostapd_config *conf);
 int hostapd_maclist_found(struct mac_acl_entry *list, int num_entries,