WPS: Add support for setting timeout for PIN

[wpasupplicant] / hostapd / config.h

diff --git a/hostapd/config.h b/hostapd/config.h
index a3247f2..6844bd4 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;
 };
 
@@ -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) */
@@ -271,7 +267,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;
 
@@ -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
  */
@@ -353,9 +341,6 @@ struct hostapd_config {
 
        const struct wpa_driver_ops *driver;
 
-       int passive_scan_interval; /* seconds, 0 = disabled */
-       int passive_scan_listen; /* usec */
-       int passive_scan_mode;
        int ap_table_max_size;
        int ap_table_expiration_time;
 
@@ -371,13 +356,13 @@ struct hostapd_config {
        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,
@@ -396,6 +381,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,