wpa_supplicant: Parent interface should know about its dedicated P2P dev

[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 f375486..e122b74 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -273,6 +273,7 @@ struct wpa_global {
        } conc_pref;
        unsigned int p2p_per_sta_psk:1;
        unsigned int p2p_fail_on_wps_complete:1;
+       unsigned int p2p_24ghz_social_channels:1;
 
 #ifdef CONFIG_WIFI_DISPLAY
        int wifi_display;
@@ -571,8 +572,9 @@ struct wpa_supplicant {
        int scan_id[MAX_SCAN_ID];
        unsigned int scan_id_count;
 
-       unsigned int drv_flags;
+       u64 drv_flags;
        unsigned int drv_enc;
+       unsigned int drv_smps_modes;
 
        /*
         * A bitmap of supported protocols for probe response offload. See
@@ -651,6 +653,7 @@ struct wpa_supplicant {
                struct sae_data sae;
                struct wpabuf *sae_token;
                int sae_group_index;
+               unsigned int sae_pmksa_caching:1;
 #endif /* CONFIG_SAE */
        } sme;
 #endif /* CONFIG_SME */
@@ -662,6 +665,8 @@ struct wpa_supplicant {
        void *ap_configured_cb_data;
 #endif /* CONFIG_AP */
 
+       struct hostapd_iface *ifmsh;
+
        unsigned int off_channel_freq;
        struct wpabuf *pending_action_tx;
        u8 pending_action_src[ETH_ALEN];
@@ -683,6 +688,7 @@ struct wpa_supplicant {
        int p2p_mgmt;
 
 #ifdef CONFIG_P2P
+       struct wpa_supplicant *p2p_dev;
        struct p2p_go_neg_results *go_params;
        int create_p2p_iface;
        u8 pending_interface_addr[ETH_ALEN];
@@ -753,6 +759,7 @@ struct wpa_supplicant {
        unsigned int p2p_go_vht:1;
        unsigned int user_initiated_pd:1;
        unsigned int p2p_go_group_formation_completed:1;
+       unsigned int group_formation_reported:1;
        unsigned int waiting_presence_resp;
        int p2p_first_connection_timeout;
        unsigned int p2p_nfc_tag_enabled:1;
@@ -773,6 +780,10 @@ struct wpa_supplicant {
                                        * formation */
        u8 p2p_peer_oob_pubkey_hash[WPS_OOB_PUBKEY_HASH_LEN];
        u8 p2p_ip_addr_info[3 * 4];
+
+       /* group common frequencies */
+       int *p2p_group_common_freqs;
+       unsigned int p2p_group_common_freqs_num;
 #endif /* CONFIG_P2P */
 
        struct wpa_ssid *bgscan_ssid;
@@ -843,6 +854,7 @@ struct wpa_supplicant {
 
        unsigned int no_keep_alive:1;
        unsigned int ext_mgmt_frame_handling:1;
+       unsigned int ext_eapol_frame_io:1;
 
 #ifdef CONFIG_WNM
        u8 wnm_dialog_token;
@@ -866,6 +878,11 @@ struct wpa_supplicant {
        unsigned int ext_work_id;
 
        struct wpabuf *vendor_elem[NUM_VENDOR_ELEM_FRAMES];
+
+#ifdef CONFIG_TESTING_OPTIONS
+       struct l2_packet_data *l2_test;
+       unsigned int extra_roc_dur;
+#endif /* CONFIG_TESTING_OPTIONS */
 };