WPS: Ignore too long Device Name attribute

[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 7d22000a001cd2379cbb1cf542ec1bad1c69b9c4..2d517f1a2472ec614f7674c2a497b365a02077e1 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -275,6 +275,8 @@ struct wpa_global {
        unsigned int p2p_per_sta_psk:1;
        unsigned int p2p_fail_on_wps_complete:1;
        unsigned int p2p_24ghz_social_channels:1;
+       unsigned int pending_p2ps_group:1;
+       unsigned int pending_group_iface_for_p2ps:1;
 
 #ifdef CONFIG_WIFI_DISPLAY
        int wifi_display;
@@ -646,6 +648,7 @@ struct wpa_supplicant {
        unsigned int eap_expected_failure:1;
        unsigned int reattach:1; /* reassociation to the same BSS requested */
        unsigned int mac_addr_changed:1;
+       unsigned int added_vif:1;
 
        struct os_reltime last_mac_addr_change;
        int last_mac_addr_style;
@@ -710,6 +713,7 @@ struct wpa_supplicant {
        int mesh_if_idx;
        unsigned int mesh_if_created:1;
        unsigned int mesh_ht_enabled:1;
+       int mesh_auth_block_duration; /* sec */
 #endif /* CONFIG_MESH */
 
        unsigned int off_channel_freq;
@@ -771,7 +775,7 @@ struct wpa_supplicant {
        int force_long_sd;
        u16 pending_pd_config_methods;
        enum {
-               NORMAL_PD, AUTO_PD_GO_NEG, AUTO_PD_JOIN
+               NORMAL_PD, AUTO_PD_GO_NEG, AUTO_PD_JOIN, AUTO_PD_ASP
        } pending_pd_use;
 
        /*
@@ -810,6 +814,7 @@ struct wpa_supplicant {
        unsigned int p2p_nfc_tag_enabled:1;
        unsigned int p2p_peer_oob_pk_hash_known:1;
        unsigned int p2p_disable_ip_addr_req:1;
+       unsigned int p2ps_join_addr_valid:1;
        int p2p_persistent_go_freq;
        int p2p_persistent_id;
        int p2p_go_intent;
@@ -829,6 +834,7 @@ struct wpa_supplicant {
        /* group common frequencies */
        int *p2p_group_common_freqs;
        unsigned int p2p_group_common_freqs_num;
+       u8 p2ps_join_addr[ETH_ALEN];
 #endif /* CONFIG_P2P */
 
        struct wpa_ssid *bgscan_ssid;
@@ -883,6 +889,12 @@ struct wpa_supplicant {
                u16 num_modes;
                u16 flags;
        } hw;
+       enum local_hw_capab {
+               CAPAB_NO_HT_VHT,
+               CAPAB_HT,
+               CAPAB_HT40,
+               CAPAB_VHT,
+       } hw_capab;
 #ifdef CONFIG_MACSEC
        struct ieee802_1x_kay *kay;
 #endif /* CONFIG_MACSEC */
@@ -904,6 +916,7 @@ struct wpa_supplicant {
        unsigned int ext_eapol_frame_io:1;
        unsigned int wmm_ac_supported:1;
        unsigned int ext_work_in_progress:1;
+       unsigned int own_disconnect_req:1;
 
 #define MAC_ADDR_RAND_SCAN       BIT(0)
 #define MAC_ADDR_RAND_SCHED_SCAN BIT(1)
@@ -1023,7 +1036,8 @@ void free_hw_features(struct wpa_supplicant *wpa_s);
 void wpa_show_license(void);
 
 struct wpa_supplicant * wpa_supplicant_add_iface(struct wpa_global *global,
-                                                struct wpa_interface *iface);
+                                                struct wpa_interface *iface,
+                                                struct wpa_supplicant *parent);
 int wpa_supplicant_remove_iface(struct wpa_global *global,
                                struct wpa_supplicant *wpa_s,
                                int terminate);
@@ -1127,4 +1141,5 @@ int get_shared_radio_freqs_data(struct wpa_supplicant *wpa_s,
 int get_shared_radio_freqs(struct wpa_supplicant *wpa_s,
                           int *freq_array, unsigned int len);
 
+void wpas_network_reenabled(void *eloop_ctx, void *timeout_ctx);
 #endif /* WPA_SUPPLICANT_I_H */