From fe8a3a36f0d1033219b799d96ea0d55c27e01261 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 18 Dec 2011 22:19:21 +0000
Subject: [PATCH] mac80211: apply txpower after bringing up the interface,
 should fix #10113

SVN-Revision: 29566
---
 package/mac80211/files/lib/wifi/mac80211.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 7a4e29d0f7..11e0b04459 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
-- 
2.25.1