From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964871AbaEKTnN (ORCPT ); Sun, 11 May 2014 15:43:13 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:48303 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933523AbaEKTYa (ORCPT ); Sun, 11 May 2014 15:24:30 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Felix Fietkau , Johannes Berg Subject: [PATCH 3.10 29/48] mac80211: exclude AP_VLAN interfaces from tx power calculation Date: Sun, 11 May 2014 21:20:03 +0200 Message-Id: <20140511191952.063700876@linuxfoundation.org> X-Mailer: git-send-email 1.9.0 In-Reply-To: <20140511191948.079900414@linuxfoundation.org> References: <20140511191948.079900414@linuxfoundation.org> User-Agent: quilt/0.60-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Felix Fietkau 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 Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/mac80211/main.c | 2 ++ 1 file changed, 2 insertions(+) --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -157,6 +157,8 @@ static u32 ieee80211_hw_conf_chan(struct 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();