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

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 7a4e29d..11e0b04 100644 (file)
--- 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