Rename EAP server defines from EAP_* to EAP_SERVER_*

[wpasupplicant] / hostapd / config.h

diff --git a/hostapd/config.h b/hostapd/config.h
index 5c7d040..ea530d4 100644 (file)
--- a/hostapd/config.h
+++ b/hostapd/config.h
@@ -135,11 +135,11 @@ struct hostapd_tx_queue_params {
        int configured;
 };
 
-struct hostapd_wme_ac_params {
+struct hostapd_wmm_ac_params {
        int cwmin;
        int cwmax;
        int aifs;
-       int txopLimit; /* in units of 32us */
+       int txop_limit; /* in units of 32us */
        int admission_control_mandatory;
 };
 
@@ -189,9 +189,6 @@ struct hostapd_bss_config {
        char iapp_iface[IFNAMSIZ + 1]; /* interface used with IAPP broadcast
                                        * frames */
 
-       u8 assoc_ap_addr[ETH_ALEN];
-       int assoc_ap; /* whether assoc_ap_addr is set */
-
        enum {
                ACCEPT_UNLESS_DENIED = 0,
                DENY_UNLESS_ACCEPTED = 1,
@@ -213,16 +210,17 @@ struct hostapd_bss_config {
                IEEE80211W_OPTIONAL = 1,
                IEEE80211W_REQUIRED = 2
        } ieee80211w;
-       /* dot11AssociationPingResponseTimeout (in TU) */
-       unsigned int assoc_ping_timeout;
-       /* dot11AssociationMaximumPingAttempts */
-       int assoc_ping_attempts;
+       /* dot11AssociationSAQueryMaximumTimeout (in TUs) */
+       unsigned int assoc_sa_query_max_timeout;
+       /* dot11AssociationSAQueryRetryTimeout (in TUs) */
+       int assoc_sa_query_retry_timeout;
 #endif /* CONFIG_IEEE80211W */
        int wpa_pairwise;
        int wpa_group;
        int wpa_group_rekey;
        int wpa_strict_rekey;
        int wpa_gmk_rekey;
+       int wpa_ptk_rekey;
        int rsn_pairwise;
        int rsn_preauth;
        char *rsn_preauth_interfaces;
@@ -273,7 +271,7 @@ struct hostapd_bss_config {
        int ap_max_inactivity;
        int ignore_broadcast_ssid;
 
-       int wme_enabled;
+       int wmm_enabled;
 
        struct hostapd_vlan *vlan, *vlan_tail;
 
@@ -287,6 +285,34 @@ struct hostapd_bss_config {
        u16 max_listen_interval;
 
        int okc; /* Opportunistic Key Caching */
+
+       int wps_state;
+#ifdef CONFIG_WPS
+       int ap_setup_locked;
+       u8 uuid[16];
+       char *wps_pin_requests;
+       char *device_name;
+       char *manufacturer;
+       char *model_name;
+       char *model_number;
+       char *serial_number;
+       char *device_type;
+       char *config_methods;
+       u8 os_version[4];
+       char *ap_pin;
+       int skip_cred_build;
+       u8 *extra_cred;
+       size_t extra_cred_len;
+       int wps_cred_processing;
+       u8 *ap_settings;
+       size_t ap_settings_len;
+       char *upnp_iface;
+       char *friendly_name;
+       char *manufacturer_url;
+       char *model_description;
+       char *model_url;
+       char *upc;
+#endif /* CONFIG_WPS */
 };
 
 
@@ -303,7 +329,6 @@ typedef enum {
  */
 struct hostapd_config {
        struct hostapd_bss_config *bss, *last_bss;
-       struct hostapd_radius_servers *radius;
        size_t num_bss;
 
        u16 beacon_int;
@@ -342,18 +367,17 @@ struct hostapd_config {
                          */
 
        int ieee80211d;
-       unsigned int ieee80211h; /* Enable/Disable 80211h */
 
        struct hostapd_tx_queue_params tx_queue[NUM_TX_QUEUES];
 
        /*
-        * WME AC parameters, in same order as 802.1D, i.e.
+        * WMM AC parameters, in same order as 802.1D, i.e.
         * 0 = BE (best effort)
         * 1 = BK (background)
         * 2 = VI (video)
         * 3 = VO (voice)
         */
-       struct hostapd_wme_ac_params wme_ac_params[4];
+       struct hostapd_wmm_ac_params wmm_ac_params[4];
 
        enum {
                INTERNAL_BRIDGE_DO_NOT_CONTROL = -1,
@@ -362,10 +386,11 @@ struct hostapd_config {
        } bridge_packets;
 
 #ifdef CONFIG_IEEE80211N
-       int ieee80211n;
        int ht_op_mode_fixed;
        u16 ht_capab;
 #endif /* CONFIG_IEEE80211N */
+       int ieee80211n;
+       int secondary_channel;
 };