diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-12-18 22:19:21 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-12-18 22:19:21 +0000 |
| commit | 8d7f4429212fea723094527adc07a5ad0517874e (patch) | |
| tree | 98cafbac1e6857253843206e2748c4190392cbb9 | |
| parent | b156662f7a006c206c03c7c311ac8e55427a6889 (diff) | |
mac80211: apply txpower after bringing up the interface, should fix #10113
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29566 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/mac80211/files/lib/wifi/mac80211.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index 7a4e29d0f..11e0b0445 100644 --- a/package/mac80211/files/lib/wifi/mac80211.sh +++ b/package/mac80211/files/lib/wifi/mac80211.sh @@ -394,12 +394,6 @@ enable_mac80211() { [ -n "$fixed" -a -n "$channel" ] && iw dev "$ifname" set channel "$channel" fi - config_get vif_txpower "$vif" txpower - # use vif_txpower (from wifi-iface) to override txpower (from - # wifi-device) if the latter doesn't exist - txpower="${txpower:-$vif_txpower}" - [ -z "$txpower" ] || iw dev "$ifname" set txpower fixed "${txpower%%.*}00" - i=$(($i + 1)) done @@ -434,6 +428,12 @@ enable_mac80211() { [ ! "$mode" = "ap" ] || continue ifconfig "$ifname" up + config_get vif_txpower "$vif" txpower + # use vif_txpower (from wifi-iface) to override txpower (from + # wifi-device) if the latter doesn't exist + txpower="${txpower:-$vif_txpower}" + [ -z "$txpower" ] || iw dev "$ifname" set txpower fixed "${txpower%%.*}00" + if [ ! "$mode" = "ap" ]; then ifconfig "$ifname" up case "$mode" in |