Changeset 14306


Ignore:
Timestamp:
2009-01-31T17:08:19+01:00 (7 years ago)
Author:
agb
Message:

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

Location:
trunk/package/broadcom-wl
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/broadcom-wl/Makefile

    r13912 r14306  
    1 #  
    2 # Copyright (C) 2006 OpenWrt.org 
     1# 
     2# Copyright (C) 2006-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1212PKG_NAME:=broadcom-wl 
    1313PKG_VERSION:=4.150.10.5.3 
    14 PKG_RELEASE:=1 
     14PKG_RELEASE:=2 
    1515WLC_VERSION:=0.1 
    1616 
  • trunk/package/broadcom-wl/files/lib/wifi/broadcom.sh

    r13912 r14306  
    124124        config_get maclist "$device" maclist 
    125125        config_get macaddr "$device" macaddr 
    126         local vif_pre_up vif_post_up vif_do_up txpower 
     126        config_get txpower "$device" txpower 
     127        local vif_pre_up vif_post_up vif_do_up vif_txpower 
    127128 
    128129        _c=0 
     
    153154 
    154155        for vif in $vifs; do 
    155                 config_get txpower "$vif" txpower 
     156                config_get vif_txpower "$vif" txpower 
    156157 
    157158                config_get mode "$vif" mode 
     
    306307$vif_do_up 
    307308EOF 
    308         [ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm  
     309 
     310        # use vif_txpower (from last wifi-iface) instead of txpower (from 
     311        # wifi-device) if the latter does not exist 
     312        txpower=${txpower:-$vif_txpower} 
     313        [ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm 
    309314 
    310315        eval "$nas_cmd" 
Note: See TracChangeset for help on using the changeset viewer.