merge r13236, r13239 and r13240

SVN-Revision: 13241

diff --git a/docs/wireless.tex b/docs/wireless.tex
index d6a71e28a9e95139c91737b8ce185cb676c598d7..0f87810203247861305840f549052307b75d7b9c 100644 (file)
--- a/docs/wireless.tex
+++ b/docs/wireless.tex
@@ -93,18 +93,21 @@ of that (if supported by the driver).
 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
+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)
+    option rxantenna  0,1,2 (atheros, broadcom)
+    option txantenna  0,1,2 (atheros, broadcom)
 
 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 ssid     ssid name
     option bssid    bssid address
     option encryption none, wep, psk, psk2, wpa, wpa2 
@@ -143,11 +146,11 @@ config wifi-iface
     \item \texttt{diversity} \\
        Optional: Enable diversity for the Wi-Fi device. This feature is supported only on the atheros chipset.
 
-    \item \texttt{rxanteanna} \\
-       Optional: Antenna identifier (0, 1 or 2) for reception. 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{txanteanna} \\
-       Optional: Antenna identifier (0, 1 or 2) for emission. This feature is supported only on the atheros chipset.
+    \item \texttt{txantenna} \\
+       Optional: Antenna identifier (0, 1 or 2) for emission. This feature is supported by atheros and some broadcom chipsets.
 
 \end{itemize}
 
@@ -188,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{txpower}
+       Set the transmission power to be used. The amount is specified in dBm.
+
     \item \texttt{encryption} \\
         Encryption setting. Accepts the following values:
 

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index ece3a6961355e379a1ab1e92035d7079b7529ac6..273e5696273f1e1eae002ef3854fa8410c6f2dd6 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -117,12 +117,12 @@ enable_broadcom() {
        config_get vifs "$device" vifs
        config_get distance "$device" distance
        config_get slottime "$device" slottime
-       config_get rxant "$device" rxant
-       config_get txant "$device" txant
+       config_get rxantenna "$device" rxantenna
+       config_get txantenna "$device" txantenna
        config_get_bool frameburst "$device" frameburst
        config_get macfilter "$device" macfilter
        config_get maclist "$device" maclist
-       local vif_pre_up vif_post_up vif_do_up
+       local vif_pre_up vif_post_up vif_do_up txpower
 
        _c=0
        nas="$(which nas)"
@@ -151,6 +151,8 @@ enable_broadcom() {
        esac
 
        for vif in $vifs; do
+               config_get txpower "$vif" txpower
+
                config_get mode "$vif" mode
                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"
@@ -269,8 +271,8 @@ infra $infra
 ${wet:+wet 1}
 802.11d 0
 802.11h 0
-rxant ${rxant:-3}
-txant ${txant:-3}
+rxant ${rxantenna:-3}
+txant ${txantenna:-3}
 monitor ${monitor:-0}
 passive ${passive:-0}
 
@@ -293,6 +295,8 @@ EOF
        wlc stdin <<EOF
 $vif_do_up
 EOF
+       [ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm 
+
        eval "$nas_cmd"
 }