From 32dce30e261bd6b9487efbc2e38bf0b82fc77828 Mon Sep 17 00:00:00 2001
From: Andy Boyett <agb@openwrt.org>
Date: Sat, 31 Jan 2009 16:08:19 +0000
Subject: broadcom-wl: move txpower back to wifi-device section, but remain
 backwards compatible

SVN-Revision: 14306
---
 package/broadcom-wl/Makefile                   |  6 +++---
 package/broadcom-wl/files/lib/wifi/broadcom.sh | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'package/broadcom-wl')

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 345f849994..e49fc50a88 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl
 PKG_VERSION:=4.150.10.5.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 WLC_VERSION:=0.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 4c03aff04c..12002121a6 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -123,7 +123,8 @@ enable_broadcom() {
 	config_get macfilter "$device" macfilter
 	config_get maclist "$device" maclist
 	config_get macaddr "$device" macaddr
-	local vif_pre_up vif_post_up vif_do_up txpower
+	config_get txpower "$device" txpower
+	local vif_pre_up vif_post_up vif_do_up vif_txpower
 
 	_c=0
 	nas="$(which nas)"
@@ -152,7 +153,7 @@ enable_broadcom() {
 	esac
 
 	for vif in $vifs; do
-		config_get txpower "$vif" txpower
+		config_get vif_txpower "$vif" txpower
 
 		config_get mode "$vif" mode
 		append vif_pre_up "vif $_c" "$N"
@@ -305,7 +306,11 @@ EOF
 	wlc stdin <<EOF
 $vif_do_up
 EOF
-	[ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm 
+
+	# use vif_txpower (from last wifi-iface) instead of txpower (from
+	# wifi-device) if the latter does not exist
+	txpower=${txpower:-$vif_txpower}
+	[ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm
 
 	eval "$nas_cmd"
 }
-- 
cgit v1.2.3