Add own_addr as a parameter to sta_deauth() and sta_disassoc()

[wpasupplicant] / src / drivers / driver.h

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 1b0ac7f..db87a58 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -61,6 +61,7 @@ struct hostapd_hw_modes {
 
 #define IEEE80211_MODE_INFRA   0
 #define IEEE80211_MODE_IBSS    1
+#define IEEE80211_MODE_AP      2
 
 #define IEEE80211_CAP_ESS      0x0001
 #define IEEE80211_CAP_IBSS     0x0002
@@ -491,15 +492,7 @@ struct hostapd_freq_params {
 };
 
 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 */
+       HOSTAPD_IF_VLAN
 };
 
 struct wpa_init_params {
@@ -509,7 +502,6 @@ struct wpa_init_params {
        size_t ssid_len;
        const char *test_socket;
        int use_pae_group_addr;
-       int ht_40mhz_scan;
        char **bridge;
        size_t num_bridge;
 };
@@ -1254,8 +1246,10 @@ struct wpa_driver_ops {
        int (*hapd_send_eapol)(void *priv, const u8 *addr, const u8 *data,
                               size_t data_len, int encrypt,
                               const u8 *own_addr);
-       int (*sta_deauth)(void *priv, const u8 *addr, int reason);
-       int (*sta_disassoc)(void *priv, const u8 *addr, int reason);
+       int (*sta_deauth)(void *priv, const u8 *own_addr, const u8 *addr,
+                         int reason);
+       int (*sta_disassoc)(void *priv, const u8 *own_addr, const u8 *addr,
+                           int reason);
        int (*sta_remove)(void *priv, const u8 *addr);
        int (*hapd_get_ssid)(const char *ifname, void *priv, u8 *buf, int len);
        int (*hapd_set_ssid)(const char *ifname, void *priv, const u8 *buf,
@@ -1287,7 +1281,6 @@ struct wpa_driver_ops {
         * 1 = enabled, i.e., bridge packets between associated STAs (default)
         */
        int (*set_internal_bridge)(void *priv, int value);
-       int (*hapd_set_beacon_int)(void *priv, int value);
        /* Configure broadcast SSID mode:
         * 0 = include SSID in Beacon frames and reply to Probe Request frames
         *     that use broadcast SSID
@@ -1342,9 +1335,6 @@ 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);
 };
 
 /**
@@ -1590,6 +1580,7 @@ union wpa_event_data {
         */
        struct michael_mic_failure {
                int unicast;
+               const u8 *src;
        } michael_mic_failure;
 
        /**