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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14309 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 6 insertions, 4 deletions

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 6144ce40a..8f3ed4a25 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -50,6 +50,7 @@ enable_mac80211() {
 	local device="$1"
 	config_get channel "$device" channel
 	config_get vifs "$device" vifs
+	config_get txpower "$device" txpower
 
 	local first=1
 	for vif in $vifs; do
@@ -112,10 +113,11 @@ enable_mac80211() {
 		esac
 		config_get ssid "$vif" ssid
 
-		config_get txpwr "$vif" txpower
-		if [ -n "$txpwr" ]; then
-			iwconfig "$ifname" txpower "${txpwr%%.*}"
-		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" ] || iwconfig "$ifname" txpower "${txpower%%.*}"
 
 		config_get frag "$vif" frag
 		if [ -n "$frag" ]; then