From patchwork Fri Mar 21 13:47:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3874371 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4DB14BF549 for ; Fri, 21 Mar 2014 13:53:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74B20202A1 for ; Fri, 21 Mar 2014 13:53:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E3C02028D for ; Fri, 21 Mar 2014 13:53:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760953AbaCUNxq (ORCPT ); Fri, 21 Mar 2014 09:53:46 -0400 Received: from mail-ee0-f54.google.com ([74.125.83.54]:35180 "EHLO mail-ee0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933904AbaCUNxl (ORCPT ); Fri, 21 Mar 2014 09:53:41 -0400 Received: by mail-ee0-f54.google.com with SMTP id d49so1827946eek.41 for ; Fri, 21 Mar 2014 06:53:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2Z6sFVGtDHX8rROTbbtTbvKRH+0ahDn1DLvxqGzpZD4=; b=k+IMLf9WbuNg8rW6wc1a/N4rhKX11ENEZsoROhnZJ4zdorsOl7VJAQUyFLKpBlE2sm E+gyYnfppbHBdlSndfuVIlTsNanN/eAxbvh/7BbnuPSwUydavu4BDm9pZurRDD2krrUV 4N1Y7IU3EufNxVajtnH1zIOmRehz8978kfVUI= 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:in-reply-to :references; bh=2Z6sFVGtDHX8rROTbbtTbvKRH+0ahDn1DLvxqGzpZD4=; b=lW4dNw7P2DtadnEj3ABqF3Dw36jXVE/arsse9UOFIP8b9Ky8Az1UnigouLGcAWWhAk 2HO0nsxwZst7s89f9Qhgg0AUkXXfL9rltLMuWGydDOGNLgiLEEFKIkRlsx5rVgo0MqEh dMq+IEapITGxbDhkN/jPq4NAxic032za9zZMUDIbdEF0Kmu+X0v4478iFLdZngfwYrds 6elghFR8M2Xj1ajpIJzbjhoCMQodq7vYML1ZzegpBqHH9jFCDDc0IPtWAMOzZhxP3M0b 1+VYzQ3E938pNIyb6mdCkpYxxpkCTRpm2kWP8R3tTa0StY2kmz9XuZ5qlLf6HRTUZIKY 8nDQ== X-Gm-Message-State: ALoCoQm4laImFLwJORoQzpd/Xou40CvgHBhcFwN1C7mdY20GYTyC2dlA6q67yMgtwa3BTkL0TvaVr6ZZGgZTI7VwrchTkdNQjJtPptq11+cIgvI6kgqQ0fY= X-Received: by 10.14.199.8 with SMTP id w8mr2445639een.94.1395410020333; Fri, 21 Mar 2014 06:53:40 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id o7sm11719458eew.25.2014.03.21.06.53.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Mar 2014 06:53:39 -0700 (PDT) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Michal Kazior Subject: [PATCH v2 07/13] mac80211: improve find_chanctx() for reservations Date: Fri, 21 Mar 2014 14:47:25 +0100 Message-Id: <1395409651-26120-8-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1395409651-26120-1-git-send-email-michal.kazior@tieto.com> References: <1395150804-24090-1-git-send-email-michal.kazior@tieto.com> <1395409651-26120-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com 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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,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 Relax ieee80211_find_chanctx(). If chanctx reservation chandef is compatible with current-future assigned interfaces chandef then allow it to be used by new interfaces. Signed-off-by: Michal Kazior --- net/mac80211/chan.c | 56 +++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index 99df19c..1361788 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -28,6 +28,29 @@ static bool ieee80211_can_create_new_chanctx(struct ieee80211_local *local) return ieee80211_num_chanctx(local) < ieee80211_max_num_channels(local); } +static const struct cfg80211_chan_def * +ieee80211_chanctx_reserved_chandef(struct ieee80211_local *local, + struct ieee80211_chanctx *ctx, + const struct cfg80211_chan_def *compat) +{ + struct ieee80211_sub_if_data *sdata; + + lockdep_assert_held(&local->chanctx_mtx); + + list_for_each_entry(sdata, &ctx->reserved_vifs, + reserved_chanctx_list) { + if (!compat) + compat = &sdata->reserved_chandef; + + compat = cfg80211_chandef_compatible(&sdata->reserved_chandef, + compat); + if (!compat) + break; + } + + return compat; +} + static enum nl80211_chan_width ieee80211_get_sta_bw(struct ieee80211_sta *sta) { switch (sta->bandwidth) { @@ -181,27 +204,6 @@ static void ieee80211_change_chanctx(struct ieee80211_local *local, } } -static bool ieee80211_chanctx_is_reserved(struct ieee80211_local *local, - struct ieee80211_chanctx *ctx) -{ - struct ieee80211_sub_if_data *sdata; - bool ret = false; - - lockdep_assert_held(&local->chanctx_mtx); - rcu_read_lock(); - list_for_each_entry_rcu(sdata, &local->interfaces, list) { - if (!ieee80211_sdata_running(sdata)) - continue; - if (sdata->reserved_chanctx == ctx) { - ret = true; - break; - } - } - - rcu_read_unlock(); - return ret; -} - static struct ieee80211_chanctx * ieee80211_find_chanctx(struct ieee80211_local *local, const struct cfg80211_chan_def *chandef, @@ -217,18 +219,18 @@ ieee80211_find_chanctx(struct ieee80211_local *local, list_for_each_entry(ctx, &local->chanctx_list, list) { const struct cfg80211_chan_def *compat; - /* We don't support chanctx reservation for multiple - * vifs yet, so don't allow reserved chanctxs to be - * reused. - */ - if ((ctx->mode == IEEE80211_CHANCTX_EXCLUSIVE) || - ieee80211_chanctx_is_reserved(local, ctx)) + if (ctx->mode == IEEE80211_CHANCTX_EXCLUSIVE) continue; compat = cfg80211_chandef_compatible(&ctx->conf.def, chandef); if (!compat) continue; + compat = ieee80211_chanctx_reserved_chandef(local, ctx, + compat); + if (!compat) + continue; + ieee80211_change_chanctx(local, ctx, compat); return ctx;