scan: Add MAC address randomization in scan handling

[mech_eap.git] / wpa_supplicant / wpa_supplicant_i.h

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 8370e54..c541ccb 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -444,6 +444,7 @@ struct wpa_supplicant {
        u8 pending_bssid[ETH_ALEN]; /* If wpa_state == WPA_ASSOCIATING, this
                                     * field contains the target BSSID. */
        int reassociate; /* reassociation requested */
+       int reassoc_same_bss; /* reassociating to the same bss */
        int disconnected; /* all connections disabled; i.e., do no reassociate
                           * before this has been cleared */
        struct wpa_ssid *current_ssid;
@@ -675,6 +676,9 @@ struct wpa_supplicant {
                                        * SA Query transaction identifiers */
                struct os_reltime sa_query_start;
                struct os_reltime last_unprot_disconnect;
+               enum { HT_SEC_CHAN_UNKNOWN,
+                      HT_SEC_CHAN_ABOVE,
+                      HT_SEC_CHAN_BELOW } ht_sec_chan;
                u8 sched_obss_scan;
                u16 obss_scan_int;
                u16 bss_max_idle_period;
@@ -697,6 +701,8 @@ struct wpa_supplicant {
        struct hostapd_iface *ifmsh;
 #ifdef CONFIG_MESH
        struct mesh_rsn *mesh_rsn;
+       int mesh_if_idx;
+       unsigned int mesh_if_created:1;
 #endif /* CONFIG_MESH */
 
        unsigned int off_channel_freq;
@@ -852,6 +858,7 @@ struct wpa_supplicant {
        unsigned int auto_network_select:1;
        unsigned int fetch_all_anqp:1;
        unsigned int fetch_osu_info:1;
+       unsigned int fetch_osu_waiting_scan:1;
        unsigned int fetch_osu_icon_in_progress:1;
        struct wpa_bss *interworking_gas_bss;
        unsigned int osu_icon_id;
@@ -890,6 +897,20 @@ struct wpa_supplicant {
        unsigned int wmm_ac_supported:1;
        unsigned int ext_work_in_progress:1;
 
+#define MAC_ADDR_RAND_SCAN       BIT(0)
+#define MAC_ADDR_RAND_SCHED_SCAN BIT(1)
+#define MAC_ADDR_RAND_PNO        BIT(2)
+#define MAC_ADDR_RAND_ALL        (MAC_ADDR_RAND_SCAN | \
+                                 MAC_ADDR_RAND_SCHED_SCAN | \
+                                 MAC_ADDR_RAND_PNO)
+       unsigned int mac_addr_rand_supported;
+       unsigned int mac_addr_rand_enable;
+
+       /* MAC Address followed by mask (2 * ETH_ALEN) */
+       u8 *mac_addr_scan;
+       u8 *mac_addr_sched_scan;
+       u8 *mac_addr_pno;
+
 #ifdef CONFIG_WNM
        u8 wnm_dialog_token;
        u8 wnm_reply;
@@ -923,6 +944,8 @@ struct wpa_supplicant {
        struct wmm_tspec_element *tspecs[WMM_AC_NUM][TS_DIR_IDX_COUNT];
        struct wmm_ac_addts_request *addts_request;
        u8 wmm_ac_last_dialog_token;
+       struct wmm_tspec_element *last_tspecs;
+       u8 last_tspecs_count;
 
        struct rrm_data rrm;
 };