From patchwork Wed Nov 13 17:54:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 3179041 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 592DA9F3A0 for ; Wed, 13 Nov 2013 17:54:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC2482077C for ; Wed, 13 Nov 2013 17:54:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A9FA92078B for ; Wed, 13 Nov 2013 17:54:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758940Ab3KMRyQ (ORCPT ); Wed, 13 Nov 2013 12:54:16 -0500 Received: from mail-wg0-f54.google.com ([74.125.82.54]:53569 "EHLO mail-wg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758918Ab3KMRyP (ORCPT ); Wed, 13 Nov 2013 12:54:15 -0500 Received: by mail-wg0-f54.google.com with SMTP id y10so794957wgg.9 for ; Wed, 13 Nov 2013 09:54:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=DiyCLU8H1795/8+J9AUQSFIF1eGl6ze/47kvoAs3Ch0=; b=b8ZkHuMxHh6dZddYX+UqaSVwis22dxeL9RYDfrQD4n31Kz7+FJbJdIAlyreUU5Zm0/ kK7zGRiRlySYIAq5T/nUSETHwMVefH7ycMGmnhaAy6HWiC2YwXAXN5/UMnRFZmoMXPd2 +X5dNsAHTa/Gytd+BJvF03YXm44V0Zp4EC0AsO99+D21pIx4B1SaBKVvf1VvPwtjXpiD lWf8UD95fKdxo4ze9twCvLaaOoO5tODRXgROvyxQgB0D0nHoffdrgZPaSbbqRI42OLEA ZB31DMlBtDknx42YkiPfZNlA/Aa7sWfokpH6LBf+cqB/lEMeC+MbmTI78SLxtgji4iIu qc2Q== X-Received: by 10.180.208.49 with SMTP id mb17mr21744837wic.64.1384365254089; Wed, 13 Nov 2013 09:54:14 -0800 (PST) Received: from mcgrof@gmail.com (thinkpad-luis.rsr.lip6.fr. [132.227.76.46]) by mx.google.com with ESMTPSA id gg20sm58219208wic.1.2013.11.13.09.54.12 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 13 Nov 2013 09:54:13 -0800 (PST) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Wed, 13 Nov 2013 18:54:12 +0100 From: "Luis R. Rodriguez" To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, "Luis R. Rodriguez" Subject: [PATCH 2/5] cfg80211: intersection dfs regions when intersecting regdomains Date: Wed, 13 Nov 2013 18:54:03 +0100 Message-Id: <1384365246-24768-3-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1384365246-24768-1-git-send-email-mcgrof@do-not-panic.com> References: <1384365246-24768-1-git-send-email-mcgrof@do-not-panic.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,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Only allow DFS to be set if the DFS regions agree. Signed-off-by: Luis R. Rodriguez --- net/wireless/reg.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 2796b62..068cb40 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -571,6 +571,20 @@ static bool freq_in_rule_band(const struct ieee80211_freq_range *freq_range, } /* + * Later on we can perhaps use the more restrictive DFS + * region but we don't have information for that yet so + * for now simply disallow conflicts. + */ +static enum nl80211_dfs_regions +reg_intersect_dfs_region(const enum nl80211_dfs_regions dfs_region1, + const enum nl80211_dfs_regions dfs_region2) +{ + if (dfs_region1 != dfs_region2) + return NL80211_DFS_UNSET; + return dfs_region1; +} + +/* * Helper for regdom_intersect(), this does the real * mathematical intersection fun */ @@ -701,6 +715,8 @@ regdom_intersect(const struct ieee80211_regdomain *rd1, rd->n_reg_rules = num_rules; rd->alpha2[0] = '9'; rd->alpha2[1] = '8'; + rd->dfs_region = reg_intersect_dfs_region(rd1->dfs_region, + rd2->dfs_region); return rd; }