WPS: Use WEP key index 1..4 instead of 0..3 when configuring AP

[wpasupplicant] / hostapd / driver.h

diff --git a/hostapd/driver.h b/hostapd/driver.h
index 5d21463..3ea019e 100644 (file)
--- a/hostapd/driver.h
+++ b/hostapd/driver.h
@@ -54,6 +54,14 @@ enum hostapd_driver_if_type {
        HOSTAPD_IF_VLAN, HOSTAPD_IF_WDS
 };
 
+struct hostapd_neighbor_bss {
+       u8 bssid[ETH_ALEN];
+       int freq; /* MHz */
+       unsigned int ht:1;
+       int pri_chan;
+       int sec_chan; /* 0 for 20 MHz channels */
+};
+
 struct wpa_driver_ops {
        const char *name;               /* as appears in the config file */
 
@@ -136,7 +144,6 @@ struct wpa_driver_ops {
                             int total_flags, int flags_or, int flags_and);
        int (*set_rate_sets)(void *priv, int *supp_rates, int *basic_rates,
                             int mode);
-       int (*set_regulatory_domain)(void *priv, unsigned int rd);
        int (*set_country)(void *priv, const char *country);
        int (*set_ieee80211d)(void *priv, int enabled);
        int (*set_beacon)(const char *ifname, void *priv,
@@ -209,6 +216,9 @@ struct wpa_driver_ops {
                                 const u8 *ie, size_t len);
        int (*set_wps_probe_resp_ie)(const char *ifname, void *priv,
                                     const u8 *ie, size_t len);
+
+       const struct hostapd_neighbor_bss *
+       (*get_neighbor_bss)(void *priv, size_t *num);
 };
 
 void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
@@ -219,5 +229,22 @@ void hostapd_rx_from_unknown_sta(struct hostapd_data *hapd, const u8 *addr);
 int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
                        const u8 *ie, size_t ielen);
 void hostapd_notif_disassoc(struct hostapd_data *hapd, const u8 *addr);
+void hostapd_eapol_receive(struct hostapd_data *hapd, const u8 *sa,
+                          const u8 *buf, size_t len);
+
+struct hostapd_frame_info {
+       u32 phytype;
+       u32 channel;
+       u32 datarate;
+       u32 ssi_signal;
+
+       unsigned int passive_scan:1;
+};
+
+void hostapd_mgmt_rx(struct hostapd_data *hapd, u8 *buf, size_t len,
+                    u16 stype, struct hostapd_frame_info *fi);
+void hostapd_mgmt_tx_cb(struct hostapd_data *hapd, u8 *buf, size_t len,
+                       u16 stype, int ok);
+void hostapd_michael_mic_failure(struct hostapd_data *hapd, const u8 *addr);
 
 #endif /* DRIVER_H */