Add freq= parameter to 'set pno' command

[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 3dcc900..8a33286 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -64,6 +64,17 @@ struct wpa_interface {
         */
        const char *confanother;
 
+#ifdef CONFIG_P2P
+       /**
+        * conf_p2p_dev - Additional configuration file used to hold the
+        * P2P Device configuration parameters.
+        *
+        * This can also be %NULL. In such a case, if a P2P Device dedicated
+        * interfaces is created, the main configuration file will be used.
+        */
+       const char *conf_p2p_dev;
+#endif /* CONFIG_P2P */
+
        /**
         * ctrl_interface - Control interface parameter
         *
@@ -386,6 +397,11 @@ struct wpa_supplicant {
 
        char *confname;
        char *confanother;
+
+#ifdef CONFIG_P2P
+       char *conf_p2p_dev;
+#endif /* CONFIG_P2P */
+
        struct wpa_config *conf;
        int countermeasures;
        struct os_reltime last_michael_mic_error;
@@ -420,6 +436,9 @@ struct wpa_supplicant {
 
        enum { WPA_SETBAND_AUTO, WPA_SETBAND_5G, WPA_SETBAND_2G } setband;
 
+       /* Preferred network for the next connection attempt */
+       struct wpa_ssid *next_ssid;
+
        /* previous scan was wildcard when interleaving between
         * wildcard scans and specific SSID scan when max_ssids=1 */
        int prev_scan_wildcard;
@@ -528,6 +547,7 @@ struct wpa_supplicant {
        int scan_runs; /* number of scan runs since WPS was started */
        int *next_scan_freqs;
        int *manual_scan_freqs;
+       int *manual_sched_scan_freqs;
        unsigned int manual_scan_passive:1;
        unsigned int manual_scan_use_id:1;
        unsigned int manual_scan_only_new:1;
@@ -575,6 +595,7 @@ struct wpa_supplicant {
        u8 pending_eapol_rx_src[ETH_ALEN];
        unsigned int last_eapol_matches_bssid:1;
        unsigned int eap_expected_failure:1;
+       unsigned int reattach:1; /* reassociation to the same BSS requested */
 
        struct ibss_rsn *ibss_rsn;
 
@@ -768,7 +789,15 @@ struct wpa_supplicant {
        unsigned int auto_select:1;
        unsigned int auto_network_select:1;
        unsigned int fetch_all_anqp:1;
+       unsigned int fetch_osu_info:1;
+       unsigned int fetch_osu_icon_in_progress:1;
        struct wpa_bss *interworking_gas_bss;
+       unsigned int osu_icon_id;
+       struct osu_provider *osu_prov;
+       size_t osu_prov_count;
+       struct os_reltime osu_icon_fetch_start;
+       unsigned int num_osu_scans;
+       unsigned int num_prov_found;
 #endif /* CONFIG_INTERWORKING */
        unsigned int drv_capa_known;
 
@@ -791,6 +820,7 @@ struct wpa_supplicant {
        u8 last_gas_dialog_token, prev_gas_dialog_token;
 
        unsigned int no_keep_alive:1;
+       unsigned int ext_mgmt_frame_handling:1;
 
 #ifdef CONFIG_WNM
        u8 wnm_dialog_token;