From patchwork Sun Dec 21 16:32:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eliad Peller X-Patchwork-Id: 5524241 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 344609F326 for ; Sun, 21 Dec 2014 16:32:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 37CBD20120 for ; Sun, 21 Dec 2014 16:32:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0BFEF2011E for ; Sun, 21 Dec 2014 16:32:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751239AbaLUQcb (ORCPT ); Sun, 21 Dec 2014 11:32:31 -0500 Received: from mail-wg0-f46.google.com ([74.125.82.46]:43267 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751090AbaLUQca (ORCPT ); Sun, 21 Dec 2014 11:32:30 -0500 Received: by mail-wg0-f46.google.com with SMTP id x13so5015302wgg.19 for ; Sun, 21 Dec 2014 08:32:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=eeSvk1jySn7pyorPNfgzykIa6RxHF463GRnFuvYPcW0=; b=HK5UXnEHRrNkE0IzG5FzheNhnKOFquZLBKPoZ8qpD1eVlUbNlp7QWOni2rzN5nw0RD VacpYaqz8Byz6Mu5Pdrw1sx2U2x80wI5xguUhQeDwrg/e6vJPhvSp7TiusnYBx3kX1L3 n8wW1XIZKgSM0vU5F6o6ZWlfV8ePN/mSYF9kzAAE4mP3IugODRqKlj+Wr9G/Os1j8AZb nOM+zEyUAe6pdNAHMJ909VkM49NyCzqj8hGN1uM0huqoEaFXuMmp7Sv38OK1PkVm4Bqi KQmoe8ppVDiCrIS6RKhI3tP2ZCfLgrkbwLXxXkSMeiZch91o/u8oLU6CEH1+ILROX4R0 MHwg== X-Gm-Message-State: ALoCoQlWflieXbvBnw1MfOCCFZ6EvDDEEZ3gY/e5vpVbGCgYPiwMPnV7DzrcUffuAVAbsURFgmNT X-Received: by 10.180.93.167 with SMTP id cv7mr24510209wib.12.1419179549374; Sun, 21 Dec 2014 08:32:29 -0800 (PST) Received: from localhost.localdomain (93-173-25-207.bb.netvision.net.il. [93.173.25.207]) by mx.google.com with ESMTPSA id gy8sm9992815wib.23.2014.12.21.08.32.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 21 Dec 2014 08:32:28 -0800 (PST) From: Eliad Peller To: Johannes Berg Cc: Subject: [PATCH 1/2] mac80211: consider only relevant vifs for radar_required calculation Date: Sun, 21 Dec 2014 18:32:25 +0200 Message-Id: <1419179546-29313-1-git-send-email-eliad@wizery.com> X-Mailer: git-send-email 1.8.5.1.109.g3d252a9 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP no need to consider all the vifs, but only the ones that have this context assigned. Signed-off-by: Eliad Peller --- net/mac80211/chan.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index 5d6dae9..7f83451 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -388,22 +388,31 @@ ieee80211_find_chanctx(struct ieee80211_local *local, return NULL; } -static bool ieee80211_is_radar_required(struct ieee80211_local *local) +static bool ieee80211_is_radar_required(struct ieee80211_local *local, + struct ieee80211_chanctx *ctx) { + struct ieee80211_chanctx_conf *conf = &ctx->conf; struct ieee80211_sub_if_data *sdata; + bool required = false; + lockdep_assert_held(&local->chanctx_mtx); lockdep_assert_held(&local->mtx); rcu_read_lock(); list_for_each_entry_rcu(sdata, &local->interfaces, list) { - if (sdata->radar_required) { - rcu_read_unlock(); - return true; - } + if (!ieee80211_sdata_running(sdata)) + continue; + if (rcu_access_pointer(sdata->vif.chanctx_conf) != conf) + continue; + if (!sdata->radar_required) + continue; + + required = true; + break; } rcu_read_unlock(); - return false; + return required; } static struct ieee80211_chanctx * @@ -425,7 +434,7 @@ ieee80211_alloc_chanctx(struct ieee80211_local *local, ctx->conf.rx_chains_static = 1; ctx->conf.rx_chains_dynamic = 1; ctx->mode = mode; - ctx->conf.radar_enabled = ieee80211_is_radar_required(local); + ctx->conf.radar_enabled = ieee80211_is_radar_required(local, ctx); ieee80211_recalc_chanctx_min_def(local, ctx); return ctx; @@ -570,7 +579,7 @@ static void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local, /* for setting local->radar_detect_enabled */ lockdep_assert_held(&local->mtx); - radar_enabled = ieee80211_is_radar_required(local); + radar_enabled = ieee80211_is_radar_required(local, chanctx); if (radar_enabled == chanctx->conf.radar_enabled) return;