Changeset 14312


Ignore:
Timestamp:
2009-01-31T17:17:30+01:00 (8 years ago)
Author:
agb
Message:

merge r14306, r14307, r14309, and r14311 to 8.09:
[package] broadcom,madwifi,mac80211: move txpower from wifi-iface to wifi-device but retain backward compatiblity

Location:
branches/8.09
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/8.09/docs/wireless.tex

    r13820 r14312  
    103103    option rxantenna  0,1,2 (atheros, broadcom) 
    104104    option txantenna  0,1,2 (atheros, broadcom) 
     105    option txpower  transmission power in dBm 
    105106 
    106107config wifi-iface 
     
    108109    option device   wifi0, wifi1, wifi2, wifiN 
    109110    option mode     ap, sta, adhoc, monitor, or wds 
    110     option txpower  transmission power in dBm 
     111    option txpower  (deprecated) transmission power in dBm 
    111112    option ssid     ssid name 
    112113    option bssid    bssid address 
     
    153154        Optional: Antenna identifier (0, 1 or 2) for emission. This feature is supported by atheros and some broadcom chipsets. 
    154155 
     156    \item \texttt{txpower} 
     157        Set the transmission power to be used. The amount is specified in dBm. 
     158 
    155159\end{itemize} 
    156160 
     
    193197 
    194198    \item \texttt{txpower} 
    195         Set the transmission power to be used. The amount is specified in dBm. 
     199        (Deprecated, set in wifi-device) Set the transmission power to be used. The amount is specified in dBm. 
    196200 
    197201    \item \texttt{encryption} \\ 
  • branches/8.09/package/broadcom-wl/Makefile

    r13913 r14312  
    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 
  • branches/8.09/package/broadcom-wl/files/lib/wifi/broadcom.sh

    r13913 r14312  
    123123        config_get macfilter "$device" macfilter 
    124124        config_get maclist "$device" maclist 
    125         local vif_pre_up vif_post_up vif_do_up txpower 
     125        config_get txpower "$device" txpower 
     126        local vif_pre_up vif_post_up vif_do_up vif_txpower 
    126127 
    127128        _c=0 
     
    152153 
    153154        for vif in $vifs; do 
    154                 config_get txpower "$vif" txpower 
     155                config_get vif_txpower "$vif" txpower 
    155156 
    156157                config_get mode "$vif" mode 
     
    304305$vif_do_up 
    305306EOF 
    306         [ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm  
     307 
     308        # use vif_txpower (from last wifi-iface) instead of txpower (from 
     309        # wifi-device) if the latter does not exist 
     310        txpower=${txpower:-$vif_txpower} 
     311        [ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm 
    307312 
    308313        eval "$nas_cmd" 
  • branches/8.09/package/mac80211/Makefile

    r12589 r14312  
    1111 
    1212PKG_NAME:=mac80211 
    13 PKG_RELEASE:=1 
     13PKG_RELEASE:=2 
    1414 
    1515PKG_VERSION:=2008-08-06 
  • branches/8.09/package/mac80211/files/lib/wifi/mac80211.sh

    r12856 r14312  
    5151        config_get channel "$device" channel 
    5252        config_get vifs "$device" vifs 
     53<<<<<<< HEAD:package/mac80211/files/lib/wifi/mac80211.sh 
    5354         
     55======= 
     56        config_get txpower "$device" txpower 
     57 
     58>>>>>>> ade9976... [package] broadcom,madwifi,mac80211: move txpower from wifi-iface to wifi-device but retain backward compatiblity:package/mac80211/files/lib/wifi/mac80211.sh 
    5459        local first=1 
    5560        for vif in $vifs; do 
     
    113118                config_get ssid "$vif" ssid 
    114119 
    115                 config_get txpwr "$vif" txpower 
    116                 if [ -n "$txpwr" ]; then 
    117                         iwconfig "$ifname" txpower "${txpwr%%.*}" 
    118                 fi 
     120                config_get vif_txpower "$vif" txpower 
     121                # use vif_txpower (from wifi-iface) to override txpower (from 
     122                # wifi-device) if the latter doesn't exist 
     123                txpower="${txpower:-$vif_txpower}" 
     124                [ -z "$txpower" ] || iwconfig "$ifname" txpower "${txpower%%.*}" 
    119125 
    120126                config_get frag "$vif" frag 
  • branches/8.09/package/madwifi/Makefile

    r13014 r14312  
    1 #  
    2 # Copyright (C) 2006-2008 OpenWrt.org 
     1# 
     2# Copyright (C) 2006-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1414ifneq ($(CONFIG_MADWIFI_UPSTREAM),) 
    1515  PKG_VERSION:=0.9.4 
    16   PKG_RELEASE:=1 
     16  PKG_RELEASE:=2 
    1717 
    1818  PKG_SOURCE:=madwifi-$(PKG_VERSION).tar.gz 
     
    2727  PKG_REV:=3314 
    2828  PKG_VERSION:=r$(PKG_REV) 
    29   PKG_RELEASE:=1 
     29  PKG_RELEASE:=2 
    3030 
    3131  PKG_SOURCE_PROTO:=svn 
  • branches/8.09/package/madwifi/files/lib/wifi/madwifi.sh

    r13820 r14312  
    7070        config_get channel "$device" channel 
    7171        config_get vifs "$device" vifs 
     72        config_get txpower "$device" txpower 
    7273 
    7374        [ auto = "$channel" ] && channel=0 
     
    7576        local first=1 
    7677        for vif in $vifs; do 
    77                 local start_hostapd 
     78                local start_hostapd vif_txpower 
    7879                nosbeacon= 
    7980                config_get ifname "$vif" ifname 
     
    291292                iwconfig "$ifname" essid "$ssid" 
    292293                set_wifi_up "$vif" "$ifname" 
     294 
     295                # TXPower settings only work if device is up already 
     296                # while atheros hardware theoretically is capable of per-vif (even per-packet) txpower 
     297                # adjustment it does not work with the current atheros hal/madwifi driver 
     298 
     299                config_get vif_txpower "$vif" txpower 
     300                # use vif_txpower (from wifi-iface) instead of txpower (from wifi-device) if 
     301                # the latter doesn't exist 
     302                txpower="${txpower:-$vif_txpower}" 
     303                [ -z "$txpower" ] || iwconfig "$ifname" txpower "${txpower%%.*}" 
     304 
    293305                case "$mode" in 
    294306                        ap) 
Note: See TracChangeset for help on using the changeset viewer.