X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=docs%2Fwireless.tex;h=dd6ec43dd9ead3d4a98644aeb623c595cd510752;hb=ebe382a99bc17876e9a4612bf6a8c73303aa5eec;hp=0f87810203247861305840f549052307b75d7b9c;hpb=a4fd52693651731d12d7f3f87ccca92a10b07b60;p=openwrt-10.03%2F.git

diff --git a/docs/wireless.tex b/docs/wireless.tex
index 0f8781020..dd6ec43dd 100644
--- a/docs/wireless.tex
+++ b/docs/wireless.tex
@@ -31,7 +31,7 @@ config wifi-iface
 config wifi-device      "wifi0"
     option type         "atheros"
     option channel      "5"
-    option agmode  	"11g"
+    option hwmode	"11g"
 
 config wifi-iface
     option device       "wifi0"
@@ -99,18 +99,19 @@ config wifi-device    wifi device name
     option channel    1-14
     option maxassoc   1-128 (broadcom only)
     option distance   1-n
-    option agmode     11b, 11g, 11a, 11bg (atheros only)
+    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 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 
+    option encryption none, wep, psk, psk2, wpa, wpa2
     option key      encryption key
     option key1     key 1
     option key2     key 2
@@ -152,6 +153,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 +196,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: