mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-11-18 14:47:46 +01:00
Code Issues

broadcom-wl: move txpower back to wifi-device section, but remain backwards compatible

Browse Source 
SVN-Revision: 14306
This commit is contained in:
Andy Boyett 2009-01-31 16:08:19 +00:00
parent 730346e2d5
commit 32dce30e26
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/broadcom-wl/Makefile
View File

@ -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

11
package/broadcom-wl/files/lib/wifi/broadcom.sh
View File

@ -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"
}