2014-04-10 13:06:54

by Felix Fietkau

Subject: [PATCH 3.15] 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: [email protected]
Signed-off-by: Felix Fietkau <[email protected]>
---
net/mac80211/main.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 4172d42..4c1bf61 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();
--
1.8.5.2 (Apple Git-48)

2014-04-11 07:38:20

by Johannes Berg

Subject: Re: [PATCH 3.15] mac80211: exclude AP_VLAN interfaces from tx power calculation

On Thu, 2014-04-10 at 15:06 +0200, Felix Fietkau wrote:
> 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.

Applied.

johannes