diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-04-10 15:06:48 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-13 13:59:44 +0200 |
| commit | 4dc15ca34591231e91a50b10320b6265e10aa127 (patch) | |
| tree | 378133015f96d74137742a626c37f40b615e24ce /net | |
| parent | 007058ac423d001c996682baf10fed481186df37 (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')
| -rw-r--r-- | net/mac80211/main.c | 2 |
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) 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(); |