[8.09] backport r18528

[openwrt/svn-archive/archive.git] / docs / wireless.tex

diff --git a/docs/wireless.tex b/docs/wireless.tex
index bc41b0e054f21e0e28bab93dd3a89034b3e7fc82..6243763b79dea58d85d2500dcaef2f95ded6c5a2 100644 (file)
--- a/docs/wireless.tex
+++ b/docs/wireless.tex
@@ -102,12 +102,13 @@ config wifi-device    wifi device name
     option hwmode     11b, 11g, 11a, 11bg (atheros, mac80211)
     option rxantenna  0,1,2 (atheros, broadcom)
     option txantenna  0,1,2 (atheros, broadcom)
+    option txpower  transmission power in dBm
 
 config wifi-iface
     option network  the interface you want wifi to bridge with
     option device   wifi0, wifi1, wifi2, wifiN
     option mode     ap, sta, adhoc, monitor, or wds
-    option txpower  transmission power in dBm
+    option txpower  (deprecated) transmission power in dBm
     option ssid     ssid name
     option bssid    bssid address
     option encryption none, wep, psk, psk2, wpa, wpa2
@@ -120,6 +121,8 @@ config wifi-iface
     option port     port
     option hidden   0,1
     option isolate  0,1
+    option doth     0,1        (atheros, broadcom)
+    option wmm      0,1        (atheros, broadcom)
 \end{Verbatim}
 
 \paragraph{Options for the \texttt{wifi-device}:}
@@ -152,6 +155,9 @@ config wifi-iface
     \item \texttt{txantenna} \\
        Optional: Antenna identifier (0, 1 or 2) for emission. This feature is supported by atheros and some broadcom chipsets.
 
+    \item \texttt{txpower}
+       Set the transmission power to be used. The amount is specified in dBm.
+
 \end{itemize}
 
 \paragraph{Options for the \texttt{wifi-iface}:}
@@ -192,7 +198,7 @@ config wifi-iface
        Set the BSSID address to be used for wds to set the mac address of the other wds unit.
 
     \item \texttt{txpower}
-       Set the transmission power to be used. The amount is specified in dBm.
+       (Deprecated, set in wifi-device) Set the transmission power to be used. The amount is specified in dBm.
 
     \item \texttt{encryption} \\
         Encryption setting. Accepts the following values:
@@ -223,6 +229,14 @@ config wifi-iface
         Optional: Isolation is a mode usually set on hotspots that limits the clients to communicate only with the AP and not with other wireless clients.
         0 disables ap isolation (default); 1 enables ap isolation.
 
+    \item \texttt{doth} \\
+        Optional: Toggle 802.11h mode.
+        0 disables 802.11h (default); 1 enables it.
+
+    \item \texttt{wmm} \\
+        Optional: Toggle 802.11e mode.
+        0 disables 802.11e (default); 1 enables it.
+
 \end{itemize}
 
 \paragraph{Wireless Distribution System}