TDLS: Declare tdls_testing as extern in a header file

[mech_eap.git] / wpa_supplicant / config_ssid.h

diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
index 1c63e51..1ecdfc0 100644 (file)
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -225,7 +225,9 @@ struct wpa_ssid {
         *
         * scan_ssid can be used to scan for APs using hidden SSIDs.
         * Note: Many drivers do not support this. ap_mode=2 can be used with
-        * such drivers to use hidden SSIDs.
+        * such drivers to use hidden SSIDs. Note2: Most nl80211-based drivers
+        * do support scan_ssid=1 and that should be used with them instead of
+        * ap_scan=2.
         */
        int scan_ssid;
 
@@ -358,6 +360,19 @@ struct wpa_ssid {
        } mode;
 
        /**
+        * pbss - Whether to use PBSS. Relevant to DMG networks only.
+        * 0 = do not use PBSS
+        * 1 = use PBSS
+        * 2 = don't care (not allowed in AP mode)
+        * Used together with mode configuration. When mode is AP, it
+        * means to start a PCP instead of a regular AP. When mode is INFRA it
+        * means connect to a PCP instead of AP. In this mode you can also
+        * specify 2 (don't care) meaning connect to either AP or PCP.
+        * P2P_GO and P2P_GROUP_FORMATION modes must use PBSS in DMG network.
+        */
+       int pbss;
+
+       /**
         * disabled - Whether this network is currently disabled
         *
         * 0 = this network can be used (default).
@@ -429,6 +444,18 @@ struct wpa_ssid {
         */
        int fixed_freq;
 
+#ifdef CONFIG_ACS
+       /**
+        * ACS - Automatic Channel Selection for AP mode
+        *
+        * If present, it will be handled together with frequency.
+        * frequency will be used to determine hardware mode only, when it is
+        * used for both hardware mode and channel when used alone. This will
+        * force the channel to be set to 0, thus enabling ACS.
+        */
+       int acs;
+#endif /* CONFIG_ACS */
+
        /**
         * mesh_basic_rates - BSS Basic rate set for mesh network
         *
@@ -447,6 +474,10 @@ struct wpa_ssid {
 
        int vht;
 
+       u8 max_oper_chwidth;
+
+       unsigned int vht_center_freq2;
+
        /**
         * wpa_ptk_rekey - Maximum lifetime for PTK in seconds
         *
@@ -717,6 +748,14 @@ struct wpa_ssid {
         * this MBSS will trigger a peering attempt.
         */
        int no_auto_peer;
+
+       /**
+        * wps_disabled - WPS disabled in AP mode
+        *
+        * 0 = WPS enabled and configured (default)
+        * 1 = WPS disabled
+        */
+       int wps_disabled;
 };
 
 #endif /* CONFIG_SSID_H */