aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-04-10 09:06:48 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-13 07:59:44 -0400
commit4dc15ca34591231e91a50b10320b6265e10aa127 (patch)
tree378133015f96d74137742a626c37f40b615e24ce /net/mac80211/main.c
parent007058ac423d001c996682baf10fed481186df37 (diff)
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>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 8a7bfc47d577..6658c5809353 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -157,6 +157,8 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local)
157 list_for_each_entry_rcu(sdata, &local->interfaces, list) { 157 list_for_each_entry_rcu(sdata, &local->interfaces, list) {
158 if (!rcu_access_pointer(sdata->vif.chanctx_conf)) 158 if (!rcu_access_pointer(sdata->vif.chanctx_conf))
159 continue; 159 continue;
160 if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
161 continue;
160 power = min(power, sdata->vif.bss_conf.txpower); 162 power = min(power, sdata->vif.bss_conf.txpower);
161 } 163 }
162 rcu_read_unlock(); 164 rcu_read_unlock();