X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=hostapd%2Fconfig.h;h=a3247f26d4eebc913ac6a9b525a245297568a64d;hb=fda90ab4b73b19d4638e8b7cd4c90458e51f9e3e;hp=cc39335be0f11b6b26c0463ba3f935ce71a795bf;hpb=d52e94f9653cc05a8884888044250d15c4d52697;p=wpasupplicant

diff --git a/hostapd/config.h b/hostapd/config.h
index cc39335..a3247f2 100644
--- a/hostapd/config.h
+++ b/hostapd/config.h
@@ -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,10 +210,10 @@ 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;
@@ -288,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 */
 };
 
 
@@ -304,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;
@@ -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;
 };