diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-04-10 15:06:48 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-04-11 09:37:41 +0200 |
| commit | 764152ff66f4a8be1f9d7981e542ffdaa5bd7aff (patch) | |
| tree | 93b567d6fd885a6d89a2dbc96bcc7d6c9bed00a5 /net/mac80211/main.c | |
| parent | 990baec022ccb97b6bb4185624f4fe7cd6150333 (diff) | |
| download | linux-764152ff66f4a8be1f9d7981e542ffdaa5bd7aff.tar.gz linux-764152ff66f4a8be1f9d7981e542ffdaa5bd7aff.tar.bz2 linux-764152ff66f4a8be1f9d7981e542ffdaa5bd7aff.zip | |
mac80211: exclude AP_VLAN interfaces from tx power calculation
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.
Cc: stable@vger.kernel.org
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/main.c')
| -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 4172d4253197..4c1bf61bc778 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(); |