Return-path: Received: from nbd.name ([46.4.11.11]:36805 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030583AbaDJNGy (ORCPT ); Thu, 10 Apr 2014 09:06:54 -0400 From: Felix Fietkau To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net Subject: [PATCH 3.15] mac80211: exclude AP_VLAN interfaces from tx power calculation Date: Thu, 10 Apr 2014 15:06:48 +0200 Message-Id: <1397135208-14828-1-git-send-email-nbd@openwrt.org> (sfid-20140410_150704_266300_37284AB0) Sender: linux-wireless-owner@vger.kernel.org List-ID: 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 --- 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)