From patchwork Fri Mar 21 13:47:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3874351 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 10C459F382 for ; Fri, 21 Mar 2014 13:53:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 32CDC2027D for ; Fri, 21 Mar 2014 13:53:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B97D20279 for ; Fri, 21 Mar 2014 13:53:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933626AbaCUNxl (ORCPT ); Fri, 21 Mar 2014 09:53:41 -0400 Received: from mail-ee0-f45.google.com ([74.125.83.45]:57461 "EHLO mail-ee0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760948AbaCUNxg (ORCPT ); Fri, 21 Mar 2014 09:53:36 -0400 Received: by mail-ee0-f45.google.com with SMTP id d17so1820718eek.18 for ; Fri, 21 Mar 2014 06:53:35 -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=sVOBORoJUGplrg5N5JEX5xltQ98g/lfRYQsU0q9Aczo=; b=djeSqRnEoGZRk9M5obkPXoRDZdAxDgMFsJVcyco23flKkExfdpd5oT77GvZT5FyrG0 oVUGMRclKtRCipMPJvm/OKcAn/udgECNdMLzbJNygdPjclPOMsLmsjcDYZ6kPXDHtBMq sMrMBwZh3yLK4T1vgqxK0CS+qYPLa1XmFmp8w= 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=sVOBORoJUGplrg5N5JEX5xltQ98g/lfRYQsU0q9Aczo=; b=izSQ42sHFDJuxe/QRbMcgAIuv7snzvTlPm37LWQBIZ+14g3hy/VVZOcmT+ukd12MId fxboK+35FQ4p3tbeLmdXNZ2gj7F4JOV/sVfscRW4Ak2O2mhQ9FhiaRhE96s5Ux+3KgdN qdOBROyxM14vfELmiQJlrmfI72rrYUM0Hg0GlKv74PR7pK3hZo5Ejqmjoq3UvlnyxUw5 NUEDZl4c425azRHFp7N3YvsrTVLiEEbFJkIUH8g6MHbJKN6KtJmE4xFcyrUfh+9mcleR 5kT7kugcBxVg38PwPpwP0zRaXIeOTf5X1b3sT6AlzE6g+RD8JnzuJ9urS61SBArsjuzR iQBA== X-Gm-Message-State: ALoCoQm2PSkIMl8N0Spwra5ogQy1xud+hllRvlQxlZImY49OPhEwDwXGuL0DQiI32VcTD6PzaOMyL7zOLzuPIrvYShmpGPG8AbykRgBXJfCt8fDTDWoRCu0= X-Received: by 10.14.199.8 with SMTP id w8mr2445290een.94.1395410015719; Fri, 21 Mar 2014 06:53:35 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id o7sm11719458eew.25.2014.03.21.06.53.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Mar 2014 06:53:34 -0700 (PDT) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Michal Kazior Subject: [PATCH v2 04/13] mac80211: add support for radar detection for reservations Date: Fri, 21 Mar 2014 14:47:22 +0100 Message-Id: <1395409651-26120-5-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 Initial chanctx reservation code wasn't aware of radar detection requirements. This is necessary for chanctx reservations to be used for channel switching in the future. Signed-off-by: Michal Kazior --- net/mac80211/chan.c | 5 ++++- net/mac80211/ieee80211_i.h | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index 2bf2d01..6b993f9 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -736,7 +736,8 @@ int ieee80211_vif_unreserve_chanctx(struct ieee80211_sub_if_data *sdata) int ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata, const struct cfg80211_chan_def *chandef, - enum ieee80211_chanctx_mode mode) + enum ieee80211_chanctx_mode mode, + bool radar_required) { struct ieee80211_local *local = sdata->local; struct ieee80211_chanctx_conf *conf; @@ -780,6 +781,7 @@ int ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata, new_ctx->refcount++; sdata->reserved_chanctx = new_ctx; sdata->reserved_chandef = *chandef; + sdata->reserved_radar_required = radar_required; out: mutex_unlock(&local->chanctx_mtx); return ret; @@ -824,6 +826,7 @@ int ieee80211_vif_use_reserved_context(struct ieee80211_sub_if_data *sdata, /* unref our reservation */ ctx->refcount--; sdata->reserved_chanctx = NULL; + sdata->radar_required = sdata->reserved_radar_required; if (old_ctx == ctx) { /* This is our own context, just change it */ diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 41d9e49..a96e375 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -760,6 +760,7 @@ struct ieee80211_sub_if_data { /* context reservation -- protected with chanctx_mtx */ struct ieee80211_chanctx *reserved_chanctx; struct cfg80211_chan_def reserved_chandef; + bool reserved_radar_required; /* used to reconfigure hardware SM PS */ struct work_struct recalc_smps; @@ -1785,7 +1786,8 @@ ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata, int __must_check ieee80211_vif_reserve_chanctx(struct ieee80211_sub_if_data *sdata, const struct cfg80211_chan_def *chandef, - enum ieee80211_chanctx_mode mode); + enum ieee80211_chanctx_mode mode, + bool radar_required); int __must_check ieee80211_vif_use_reserved_context(struct ieee80211_sub_if_data *sdata, u32 *changed);