Renamed Ping procedure into SA Query procedure per 802.11w/D7.0

[wpasupplicant] / hostapd / hostapd.h

diff --git a/hostapd/hostapd.h b/hostapd/hostapd.h
index 6f4832e..85bcf0b 100644 (file)
--- a/hostapd/hostapd.h
+++ b/hostapd/hostapd.h
@@ -1,7 +1,7 @@
 /*
  * hostapd / Initialization and configuration
  * Host AP kernel driver
- * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2002-2008, Jouni Malinen <j@w1.fi>
  * Copyright (c) 2007-2008, Intel Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -138,12 +138,6 @@ struct hostapd_data {
 
        struct iapp_data *iapp;
 
-       enum { DO_NOT_ASSOC = 0, WAIT_BEACON, AUTHENTICATE, ASSOCIATE,
-              ASSOCIATED } assoc_ap_state;
-       char assoc_ap_ssid[33];
-       int assoc_ap_ssid_len;
-       u16 assoc_ap_aid;
-
        struct hostapd_cached_radius_acl *acl_cache;
        struct hostapd_acl_query_data *acl_queries;
 
@@ -169,28 +163,24 @@ struct hostapd_data {
 #endif /* CONFIG_FULL_DYNAMIC_VLAN */
 
        struct l2_packet_data *l2;
+       struct wps_context *wps;
+
+#ifdef CONFIG_WPS
+       u8 *wps_beacon_ie;
+       size_t wps_beacon_ie_len;
+       u8 *wps_probe_resp_ie;
+       size_t wps_probe_resp_ie_len;
+#endif /* CONFIG_WPS */
 };
 
 
 /**
- * hostapd_iface_cb - Generic callback type for per-iface asynchronous requests
- * @iface: the interface the event occured on.
- * @status: 0 if the request succeeded; -1 if the request failed.
- */
-typedef void (*hostapd_iface_cb)(struct hostapd_iface *iface, int status);
-
-
-struct hostapd_config_change;
-
-/**
  * struct hostapd_iface - hostapd per-interface data structure
  */
 struct hostapd_iface {
        char *config_fname;
        struct hostapd_config *conf;
 
-       hostapd_iface_cb setup_cb;
-
        size_t num_bss;
        struct hostapd_data **bss;
 
@@ -206,7 +196,6 @@ struct hostapd_iface {
         * current_mode->channels */
        int num_rates;
        struct hostapd_rate_data *current_rates;
-       hostapd_iface_cb hw_mode_sel_cb;
 
        u16 hw_flags;
 
@@ -234,17 +223,6 @@ struct hostapd_iface {
        /* Overlapping BSS information */
        int olbc_ht;
 
-       int dfs_enable;
-       u8 pwr_const;
-       unsigned int tx_power;
-       unsigned int sta_max_power;
-
-       unsigned int channel_switch;
-
-       struct hostapd_config_change *change;
-       hostapd_iface_cb reload_iface_cb;
-       hostapd_iface_cb config_reload_cb;
-
 #ifdef CONFIG_IEEE80211N
        u16 ht_op_mode;
 #endif /* CONFIG_IEEE80211N */
@@ -252,5 +230,6 @@ struct hostapd_iface {
 
 void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
                           int reassoc);
+int hostapd_reload_config(struct hostapd_iface *iface);
 
 #endif /* HOSTAPD_H */