Revert r14071

[openwrt.git] / docs / wireless.tex

diff --git a/docs/wireless.tex b/docs/wireless.tex
index bc9df11..bc41b0e 100644 (file)
--- 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"
 config wifi-device      "wifi0"
     option type         "atheros"
     option channel      "5"

-    option agmode      "11g"
+    option hwmode      "11g"

 
 config wifi-iface
     option device       "wifi0"
 
 config wifi-iface
     option device       "wifi0"


@@ -93,21 +93,24 @@ of that (if supported by the driver).
 A full outline of the wireless configuration file with description of each field:
 
 \begin{Verbatim}
 A full outline of the wireless configuration file with description of each field:
 
 \begin{Verbatim}

-config wifi-device     wifi device name
-    option type     broadcom, atheros, mac80211
-    option country  us, uk, fr, de, etc.
-    option channel  1-14
-    option maxassoc 1-128 (broadcom only)
-    option distance 1-n
-    option agmode     11b, 11g, 11a, 11bg (atheros only)
+config wifi-device    wifi device name
+    option type       broadcom, atheros, mac80211
+    option country    us, uk, fr, de, etc.
+    option channel    1-14
+    option maxassoc   1-128 (broadcom only)
+    option distance   1-n
+    option hwmode     11b, 11g, 11a, 11bg (atheros, mac80211)
+    option rxantenna  0,1,2 (atheros, broadcom)
+    option txantenna  0,1,2 (atheros, broadcom)

 
 config wifi-iface
 
 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 device   wifi0, wifi1, wifi2, wifiN
     option mode     ap, sta, adhoc, monitor, or wds

+    option txpower  transmission power in dBm

     option ssid     ssid name
     option bssid    bssid address
     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
     option key      encryption key
     option key1     key 1
     option key2     key 2


@@ -140,6 +143,14 @@ config wifi-iface
        \item \texttt{mode} \\
                The frequency band (\texttt{b}, \texttt{g}, \texttt{bg}, \texttt{a}). This feature is only supported on the atheros chipset.
 
        \item \texttt{mode} \\
                The frequency band (\texttt{b}, \texttt{g}, \texttt{bg}, \texttt{a}). This feature is only supported on the atheros chipset.
 

+    \item \texttt{diversity} \\
+       Optional: Enable diversity for the Wi-Fi device. This feature is supported only on the atheros chipset.
+
+    \item \texttt{rxantenna} \\
+       Optional: Antenna identifier (0, 1 or 2) for reception. This feature is supported by atheros and some broadcom chipsets.
+
+    \item \texttt{txantenna} \\
+       Optional: Antenna identifier (0, 1 or 2) for emission. This feature is supported by atheros and some broadcom chipsets.

 
 \end{itemize}
 
 
 \end{itemize}
 


@@ -180,6 +191,9 @@ config wifi-iface
     \item \texttt{bssid}
        Set the BSSID address to be used for wds to set the mac address of the other wds unit.
 
     \item \texttt{bssid}
        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.
+

     \item \texttt{encryption} \\
         Encryption setting. Accepts the following values:
 
     \item \texttt{encryption} \\
         Encryption setting. Accepts the following values:
 


@@ -211,6 +225,100 @@ config wifi-iface
 
 \end{itemize}
 
 
 \end{itemize}
 

+\paragraph{Wireless Distribution System}
+
+WDS is a non-standard mode which will be working between two Broadcom devices for instance
+but not between a Broadcom and Atheros device.
+
+\subparagraph{Unencrypted WDS connections}
+
+This configuration example shows you how to setup unencrypted WDS connections.
+We assume that the peer configured as below as the BSSID ca:fe:ba:be:00:01
+and the remote WDS endpoint ca:fe:ba:be:00:02 (option bssid field).
+
+\begin{Verbatim}
+config wifi-device      "wl0"
+    option type                "broadcom"
+    option channel      "5"
+
+config wifi-iface
+    option device       "wl0"
+    option network     lan
+    option mode         "ap"
+    option ssid         "OpenWrt"
+    option hidden       "0"
+    option encryption   "none"
+
+config wifi-iface
+    option device       "wl0"
+    option network      lan
+    option mode         wds
+    option ssid         "OpenWrt WDS"
+    option bssid        "ca:fe:ba:be:00:02"
+\end{Verbatim}
+
+\subparagraph{Encrypted WDS connections}
+
+It is also possible to encrypt WDS connections. \texttt{psk}, \texttt{psk2} and
+\texttt{psk+psk2} modes are supported. Configuration below is an example
+configuration using Pre-Shared-Keys with AES algorithm.
+
+\begin{Verbatim}
+config wifi-device  wl0
+    option type     broadcom
+    option channel  5
+
+config wifi-iface
+    option device   "wl0"
+    option network  lan
+    option mode     ap
+    option ssid     "OpenWrt"
+    option encryption  psk2
+    option key      "<key for clients>"
+
+config wifi-iface
+    option device   "wl0"
+    option network  lan
+    option mode     wds
+    option bssid    ca:fe:ba:be:00:02
+    option ssid     "OpenWrt WDS"
+    option encryption  psk2
+    option key      "<psk for WDS>"
+\end{Verbatim}
+
+\paragraph{802.1x configurations}
+
+OpenWrt supports both 802.1x client and Access Point
+configurations. 802.1x client is only working with
+Atheros or mac80211 drivers. Configuration only
+supports EAP types TLS, TTLS or PEAP.
+
+\subparagraph{EAP-TLS}
+
+\begin{Verbatim}
+config wifi-iface
+    option device         "ath0"
+    option network        lan
+    option ssid           OpenWrt
+    option eap_type       tls
+    option ca_cert        "/etc/config/certs/ca.crt"
+    option priv_key       "/etc/config/certs/priv.crt"
+    option priv_key_pwd   "PKCS#12 passphrase"
+\end{Verbatim}
+
+\subparagraph{EAP-PEAP}
+
+\begin{Verbatim}
+config wifi-iface
+    option device         "ath0"
+    option network        lan
+    option ssid           OpenWrt
+    option eap_type       peap
+    option ca_cert        "/etc/config/certs/ca.crt"
+    option auth           MSCHAPV2
+    option identity       username
+    option password       password
+\end{Verbatim}

 
 \paragraph{Limitations:}
 
 
 \paragraph{Limitations:}
 


@@ -242,7 +350,7 @@ Only the following mode combinations are supported:
 
 \paragraph{Adding a new driver configuration}
 
 
 \paragraph{Adding a new driver configuration}
 

-Since we currently only support two different wireless drivers : Broadcom and Atheros,
+Since we currently only support thread different wireless drivers : Broadcom, Atheros and mac80211,

 you might be interested in adding support for another driver like Ralink RT2x00, 
 Texas Instruments ACX100/111.
 
 you might be interested in adding support for another driver like Ralink RT2x00, 
 Texas Instruments ACX100/111.