diff options
author | Andy Boyett <agb@openwrt.org> | 2009-01-31 16:08:19 +0000 |
---|---|---|
committer | Andy Boyett <agb@openwrt.org> | 2009-01-31 16:08:19 +0000 |
commit | 28216492767f0ffe8b7a82f5dac6efd87adfaf74 (patch) | |
tree | 9766508173457d4a7bf542254e636858758b6433 /package/broadcom-wl/files/lib | |
parent | 2f386223ed7fd0d9e5c9f7044e98e72d4fe61f71 (diff) | |
download | upstream-28216492767f0ffe8b7a82f5dac6efd87adfaf74.tar.gz upstream-28216492767f0ffe8b7a82f5dac6efd87adfaf74.tar.bz2 upstream-28216492767f0ffe8b7a82f5dac6efd87adfaf74.zip |
[package] broadcom-wl: move txpower back to wifi-device section, but remain backwards compatible
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14306 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/broadcom-wl/files/lib')
-rw-r--r-- | package/broadcom-wl/files/lib/wifi/broadcom.sh | 11 |
1 files changed, 8 insertions, 3 deletions
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" } |