package/broadcom-wl:

	- use [tr]xantenna instead of [tr]xant to unify config
	- implement txpower option


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13236 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 7 insertions, 4 deletions

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index e60674a497..aa8258d3dc 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -117,12 +117,13 @@ 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
 	config_get macaddr "$device" macaddr
+	config_get txpower "$device" txpower
 	local vif_pre_up vif_post_up vif_do_up
 
 	_c=0
@@ -271,8 +272,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}
 
@@ -295,6 +296,8 @@ EOF
 	wlc stdin <<EOF
 $vif_do_up
 EOF
+	[ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm 
+
 	eval "$nas_cmd"
 }