From 0da13fa8bab3ff76cbba50ab6c8980e3fa2add22 Mon Sep 17 00:00:00 2001 From: Andy Boyett Date: Sat, 31 Jan 2009 16:09:39 +0000 Subject: [PATCH] mac80211: move txpower to wifi-device section, but remain backwards compatible SVN-Revision: 14309 --- package/mac80211/Makefile | 2 +- package/mac80211/files/lib/wifi/mac80211.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 4f14e93b6580..0448f0063a6a 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 -PKG_RELEASE:=1 +PKG_RELEASE:=2 ifneq ($(CONFIG_LINUX_2_6_27)$(CONFIG_LINUX_2_6_28),) PKG_VERSION:=2009-01-29 diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index 6144ce40ae77..8f3ed4a25ad4 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 -- 2.30.2