Move default_wep_key variable into EAPOL authenticator data

[wpasupplicant] / hostapd / hostapd.h

diff --git a/hostapd/hostapd.h b/hostapd/hostapd.h
index 8336282..6c12c8e 100644 (file)
--- a/hostapd/hostapd.h
+++ b/hostapd/hostapd.h
@@ -20,7 +20,7 @@
 #include "common.h"
 #include "hostapd_defs.h"
 
-struct hapd_driver_ops;
+struct wpa_driver_ops;
 struct wpa_ctrl_dst;
 struct radius_server_data;
 struct upnp_wps_device_sm;
@@ -54,12 +54,9 @@ struct hostapd_data {
 #define AID_WORDS ((2008 + 31) / 32)
        u32 sta_aid[AID_WORDS];
 
-       const struct hapd_driver_ops *driver;
+       const struct wpa_driver_ops *driver;
        void *drv_priv;
 
-       u8 *default_wep_key;
-       u8 default_wep_key_idx;
-
        struct radius_client_data *radius;
        int radius_client_reconfigured;
        u32 acct_session_id_hi, acct_session_id_lo;
@@ -154,9 +151,8 @@ struct hostapd_iface {
        /* Overlapping BSS information */
        int olbc_ht;
 
-#ifdef CONFIG_IEEE80211N
        u16 ht_op_mode;
-#endif /* CONFIG_IEEE80211N */
+       void (*scan_cb)(struct hostapd_iface *iface);
 };
 
 int hostapd_reload_config(struct hostapd_iface *iface);
@@ -165,6 +161,7 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
                       struct hostapd_config *conf,
                       struct hostapd_bss_config *bss);
 int hostapd_setup_interface(struct hostapd_iface *iface);
+int hostapd_setup_interface_complete(struct hostapd_iface *iface, int err);
 void hostapd_interface_deinit(struct hostapd_iface *iface);
 int handle_reload_iface(struct hostapd_iface *iface, void *ctx);
 int handle_dump_state_iface(struct hostapd_iface *iface, void *ctx);