P2P: Add more user friendly debug print of channel lists

[thirdparty/hostap.git] / wpa_supplicant / wpa_supplicant_i.h

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 604997e57ee19de1b71fc2aead229acd6a08e053..d44f0a28ea79168b919eea237a5273e93b8b3c36 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -265,12 +265,15 @@ struct wpa_global {
                WPA_CONC_PREF_P2P
        } conc_pref;
        unsigned int p2p_cb_on_scan_complete:1;
+       unsigned int p2p_per_sta_psk:1;
 
 #ifdef CONFIG_WIFI_DISPLAY
        int wifi_display;
 #define MAX_WFD_SUBELEMS 10
        struct wpabuf *wfd_subelem[MAX_WFD_SUBELEMS];
 #endif /* CONFIG_WIFI_DISPLAY */
+
+       struct psk_list_entry *add_psk; /* From group formation */
 };
 
 
@@ -644,11 +647,14 @@ struct wpa_supplicant {
        unsigned int p2p_pd_before_go_neg:1;
        unsigned int p2p_go_ht40:1;
        unsigned int user_initiated_pd:1;
+       unsigned int p2p_go_group_formation_completed:1;
+       int p2p_first_connection_timeout;
        int p2p_persistent_go_freq;
        int p2p_persistent_id;
        int p2p_go_intent;
        int p2p_connect_freq;
        struct os_time p2p_auto_started;
+       struct wpa_ssid *p2p_last_4way_hs_fail;
 #endif /* CONFIG_P2P */
 
        struct wpa_ssid *bgscan_ssid;
@@ -817,7 +823,7 @@ int disallowed_ssid(struct wpa_supplicant *wpa_s, const u8 *ssid,
                    size_t ssid_len);
 void wpas_request_connection(struct wpa_supplicant *wpa_s);
 int wpas_build_ext_capab(struct wpa_supplicant *wpa_s, u8 *buf);
-int wpas_wpa_is_in_progress(struct wpa_supplicant *wpa_s);
+int wpas_wpa_is_in_progress(struct wpa_supplicant *wpa_s, int include_current);
 
 /**
  * wpa_supplicant_ctrl_iface_ctrl_rsp_handle - Handle a control response