Fixed a typo in printf -> wpa_printf changes

[wpasupplicant] / hostapd / hostapd.conf

diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index 8df35c8..c5d82e6 100644 (file)
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -11,7 +11,7 @@ interface=wlan0
 #bridge=br0
 
 # Driver interface type (hostap/wired/madwifi/prism54/test/none/nl80211/bsd);
-# default: hostap)
+# default: hostap). nl80211 is used with all Linux mac80211 drivers.
 # Use driver=none if building hostapd as a standalone RADIUS server that does
 # not control any wireless/wired driver.
 # driver=hostap
@@ -384,6 +384,14 @@ wme_ac_vo_acm=0
 #      channel below the primary channel; [HT40+] = both 20 MHz and 40 MHz
 #      with secondary channel below the primary channel
 #      (20 MHz only if neither is set)
+#      Note: There are limits on which channels can be used with HT40- and
+#      HT40+. Following table shows the channels that may be available for
+#      HT40- and HT40+ use per IEEE 802.11n Annex J:
+#      freq            HT40-           HT40+
+#      2.4 GHz         5-13            1-7 (1-9 in Europe/Japan)
+#      5 GHz           40,48,56,64     36,44,52,60
+#      (depending on the location, not all of these channels may be available
+#      for use)
 # Spatial Multiplexing (SM) Power Save: [SMPS-STATIC] or [SMPS-DYNAMIC]
 #      (SMPS disabled if neither is set)
 # HT-greenfield: [GF] (disabled if not set)
@@ -747,13 +755,15 @@ own_ip_addr=127.0.0.1
 # 2 = required
 #ieee80211w=0
 
-# Association ping timeout (in TU = 1.024 ms; for MFP)
-# dot11AssociationPingResponseTimeout, 1...4294967295
-#assoc_ping_timeout=1000
+# Association SA Query maximum timeout (in TU = 1.024 ms; for MFP)
+# (maximum time to wait for a SA Query response)
+# dot11AssociationSAQueryMaximumTimeout, 1...4294967295
+#assoc_sa_query_max_timeout=1000
 
-# Maximum number of association pings
-# dot11AssociationMaximumPingAttempts , 1...255
-#assoc_ping_attempts=3
+# Association SA Query retry timeout (in TU = 1.024 ms; for MFP)
+# (time between two subsequent SA Query requests)
+# dot11AssociationSAQueryRetryTimeout, 1...4294967295
+#assoc_sa_query_retry_timeout=201
 
 
 # okc: Opportunistic Key Caching (aka Proactive Key Caching)
@@ -861,6 +871,7 @@ own_ip_addr=127.0.0.1
 # Universally Unique IDentifier (UUID; see RFC 4122) of the device
 # This value is used as the UUID for the internal WPS Registrar. If the AP
 # is also using UPnP, this value should be set to the device's UPnP UUID.
+# If not configured, UUID will be generated based on the local MAC address.
 #uuid=12345678-9abc-def0-1234-56789abcdef0
 
 # Note: If wpa_psk_file is set, WPS is used to generate random, per-device PSKs