From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 10 Apr 2014 13:06:48 +0000 (+0200)
Subject: mac80211: exclude AP_VLAN interfaces from tx power calculation
X-Git-Tag: upstream/snapshot3+hdmi~2977
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6acde7cd22620cfdddc9b06103479ec03686f1f6;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

mac80211: exclude AP_VLAN interfaces from tx power calculation

commit 764152ff66f4a8be1f9d7981e542ffdaa5bd7aff upstream.

Their power value is initialized to zero. This patch fixes an issue
where the configured power drops to the minimum value when AP_VLAN
interfaces are created/removed.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index d767cfb..c7a7a86 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -148,6 +148,8 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local)
 	list_for_each_entry_rcu(sdata, &local->interfaces, list) {
 		if (!rcu_access_pointer(sdata->vif.chanctx_conf))
 			continue;
+		if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
+			continue;
 		power = min(power, sdata->vif.bss_conf.txpower);
 	}
 	rcu_read_unlock();