Changeset 14309


Ignore:
Timestamp:
2009-01-31T17:09:39+01:00 (9 years ago)
Author:
agb
Message:

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

Location:
trunk/package/mac80211
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/Makefile

    r14279 r14309  
    1010 
    1111PKG_NAME:=mac80211 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414ifneq ($(CONFIG_LINUX_2_6_27)$(CONFIG_LINUX_2_6_28),) 
  • trunk/package/mac80211/files/lib/wifi/mac80211.sh

    r14246 r14309  
    5151        config_get channel "$device" channel 
    5252        config_get vifs "$device" vifs 
     53        config_get txpower "$device" txpower 
    5354 
    5455        local first=1 
     
    113114                config_get ssid "$vif" ssid 
    114115 
    115                 config_get txpwr "$vif" txpower 
    116                 if [ -n "$txpwr" ]; then 
    117                         iwconfig "$ifname" txpower "${txpwr%%.*}" 
    118                 fi 
     116                config_get vif_txpower "$vif" txpower 
     117                # use vif_txpower (from wifi-iface) to override txpower (from 
     118                # wifi-device) if the latter doesn't exist 
     119                txpower="${txpower:-$vif_txpower}" 
     120                [ -z "$txpower" ] || iwconfig "$ifname" txpower "${txpower%%.*}" 
    119121 
    120122                config_get frag "$vif" frag 
Note: See TracChangeset for help on using the changeset viewer.