WPS: Fix local configuration update after AP configuration

[wpasupplicant] / wpa_supplicant / wpa_supplicant.conf

diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf
index d4f0512..49ed96d 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.conf
+++ b/wpa_supplicant/wpa_supplicant.conf
@@ -150,6 +150,7 @@ fast_reauth=1
 # Wi-Fi Protected Setup (WPS) parameters
 
 # Universally Unique IDentifier (UUID; see RFC 4122) of the device
+# If not configured, UUID will be generated based on the local MAC address.
 #uuid=12345678-9abc-def0-1234-56789abcdef0
 
 # Device Name
@@ -183,12 +184,19 @@ fast_reauth=1
 #   1-0050F204-2 (Computer / Server)
 #   5-0050F204-1 (Storage / NAS)
 #   6-0050F204-1 (Network Infrastructure / AP)
-#device_type=6-0050F204-1
+#device_type=1-0050F204-1
 
 # OS Version
 # 4-octet operating system version number (hex string)
 #os_version=01020300
 
+# Credential processing
+#   0 = process received credentials internally (default)
+#   1 = do not process received credentials; just pass them over ctrl_iface to
+#      external program(s)
+#   2 = process received credentials internally and pass them over ctrl_iface
+#      to external program(s)
+#wps_cred_processing=0
 
 # network block
 #
@@ -234,6 +242,7 @@ fast_reauth=1
 # mode: IEEE 802.11 operation mode
 # 0 = infrastructure (Managed) mode, i.e., associate with an AP (default)
 # 1 = IBSS (ad-hoc, peer-to-peer)
+# 2 = AP (access point)
 # Note: IBSS can only be used with key_mgmt NONE (plaintext and static WEP)
 # and key_mgmt=WPA-NONE (fixed group key TKIP/CCMP). In addition, ap_scan has
 # to be set to 2 for IBSS. WPA-None requires following network block options:
@@ -247,6 +256,12 @@ fast_reauth=1
 # an IBSS network with the configured SSID is already present, the frequency of
 # the network will be used instead of this configured value.
 #
+# scan_freq: List of frequencies to scan
+# Space-separated list of frequencies in MHz to scan when searching for this
+# BSS. If the subset of channels used by the network is known, this option can
+# be used to optimize scanning to not occur on channels that the network does
+# not use. Example: scan_freq=2412 2437 2462
+#
 # proto: list of accepted protocols
 # WPA = WPA/IEEE 802.11i/D3.0
 # RSN = WPA2/IEEE 802.11i (also WPA2 can be used as an alias for RSN)
@@ -254,8 +269,7 @@ fast_reauth=1
 #
 # key_mgmt: list of accepted authenticated key management protocols
 # WPA-PSK = WPA pre-shared key (this requires 'psk' field)
-# WPA-EAP = WPA using EAP authentication (this can use an external
-#      program, e.g., Xsupplicant, for IEEE 802.1X EAP Authentication
+# WPA-EAP = WPA using EAP authentication
 # IEEE8021X = IEEE 802.1X using EAP authentication and (optionally) dynamically
 #      generated WEP keys
 # NONE = WPA is not used; plaintext or static WEP could be used