X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=wpa_supplicant%2Fwpa_supplicant_i.h;h=66f544e3a966e22fcf863f9f958995df5fee678b;hb=HEAD;hp=8a2e69057625f741d52351b18beaf626d6882b82;hpb=07a30a66c3d258124acaa3d01c796f9284dd1161;p=libeap.git

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 8a2e690..66f544e 100644
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -214,6 +214,7 @@ struct wpa_global {
 	struct dl_list p2p_srv_bonjour; /* struct p2p_srv_bonjour */
 	struct dl_list p2p_srv_upnp; /* struct p2p_srv_upnp */
 	int p2p_disabled;
+	int cross_connection;
 };
 
 
@@ -407,6 +408,7 @@ struct wpa_supplicant {
 	unsigned int drv_flags;
 	int max_scan_ssids;
 	unsigned int max_remain_on_chan;
+	unsigned int max_stations;
 
 	int pending_mic_error_report;
 	int pending_mic_error_pairwise;
@@ -423,6 +425,11 @@ struct wpa_supplicant {
 
 	struct ibss_rsn *ibss_rsn;
 
+	int set_sta_uapsd;
+	int sta_uapsd;
+	int set_ap_uapsd;
+	int ap_uapsd;
+
 #ifdef CONFIG_SME
 	struct {
 		u8 ssid[32];
@@ -473,6 +480,8 @@ struct wpa_supplicant {
 	struct p2p_group *p2p_group;
 	int p2p_long_listen;
 	char p2p_pin[10];
+	int p2p_wps_method;
+	u8 p2p_auth_invite[ETH_ALEN];
 	int p2p_sd_over_ctrl_iface;
 	int p2p_in_provisioning;
 	int pending_invite_ssid_id;
@@ -483,6 +492,28 @@ struct wpa_supplicant {
 	u8 pending_join_dev_addr[ETH_ALEN];
 	int pending_join_wps_method;
 	unsigned int roc_waiting_drv_freq;
+	int force_long_sd;
+
+	/*
+	 * Whether cross connection is disallowed by the AP to which this
+	 * interface is associated (only valid if there is an association).
+	 */
+	int cross_connect_disallowed;
+
+	/*
+	 * Whether this P2P group is configured to use cross connection (only
+	 * valid if this is P2P GO interface). The actual cross connect packet
+	 * forwarding may not be configured depending on the uplink status.
+	 */
+	int cross_connect_enabled;
+
+	/* Whether cross connection forwarding is in use at the moment. */
+	int cross_connect_in_use;
+
+	/*
+	 * Uplink interface name for cross connection
+	 */
+	char cross_connect_uplink[100];
 #endif /* CONFIG_P2P */
 
 	struct wpa_ssid *bgscan_ssid;
@@ -494,6 +525,7 @@ struct wpa_supplicant {
 	int after_wps;
 	unsigned int wps_freq;
 	int wps_fragment_size;
+	int auto_reconnect_disabled;
 };