linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 3.15] mac80211: exclude AP_VLAN interfaces from tx power calculation
@ 2014-04-10 13:06 Felix Fietkau
  2014-04-11  7:38 ` Johannes Berg
  0 siblings, 1 reply; 2+ messages in thread
From: Felix Fietkau @ 2014-04-10 13:06 UTC (permalink / raw)
  To: linux-wireless; +Cc: johannes

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>
---
 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)


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 3.15] mac80211: exclude AP_VLAN interfaces from tx power calculation
  2014-04-10 13:06 [PATCH 3.15] mac80211: exclude AP_VLAN interfaces from tx power calculation Felix Fietkau
@ 2014-04-11  7:38 ` Johannes Berg
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2014-04-11  7:38 UTC (permalink / raw)
  To: Felix Fietkau; +Cc: linux-wireless

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


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-04-11  7:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-10 13:06 [PATCH 3.15] mac80211: exclude AP_VLAN interfaces from tx power calculation Felix Fietkau
2014-04-11  7:38 ` Johannes Berg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).