From patchwork Tue May 29 21:39:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 922426 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bowerswilkins.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VWuQhh6Y"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="d8AoBZ2/"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40wRzg0CNSz9s0W for ; Wed, 30 May 2018 07:43:11 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=royfCpCT/R20ou9YcxCK0bUIdCTXNMUsbB6ZWqB5SGM=; b=VWuQhh6Yp9OskQ 5aNA0KYVTcF4ST4X5mydEolvQaD+h1FpwgrU9+Z+MhyWNZXcNlyTniOktnYLMR8aqBm8SbnhK7Kw7 FXtzhkndxd131CTxtYYOr2KwoC/69OOGUtXjPb/m/dfEJahuFx6HdGQpMRYkbYCbHUmNWWoIOZdAX TtpyI08+NjUMJhBrQwPxeQq+6PUGz4TK3MzHucCIXg2/szz6mHswUi+Oz9jUUkQ7q62la04kSAsTQ ZG89XSP0WL4UqapB2EbRXxzqUtmyQ3UHCnpDO7BF6YMmfwXt//DxHUu5HGTSaQvQCGgklyGAGsGjR OWPKrfqgf/1OZTuERrzw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNmOU-0007oR-Ms; Tue, 29 May 2018 21:43:02 +0000 Received: from mail-db5eur03on0616.outbound.protection.outlook.com ([2a01:111:f400:fe0a::616] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNmLu-0004jj-MF for hostap@lists.infradead.org; Tue, 29 May 2018 21:40:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bowerswilkins.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/QhH+KQNLfzKakyM0V4vVXXGQN/nbTIxSWU/T7Sldr4=; b=d8AoBZ2/Km3qR2crTBRXvlcrGn0lGNo73r/FMnpa9ueJ5MCP7rZ+RaZISNF/cZN02x2Hkzv/Qp/aMpUH1QgD9zcF+kXFkJZN8FNbonRSFC6niCjqpjF3RX2W3znc6WkRZ7dVTK0z61c2x1VvEmuaxAaPe9ntK/l81uH0eJ96iNo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:bc83:1bef:7e2f:6957) by DB5PR04MB1654.eurprd04.prod.outlook.com (2a01:111:e400:5995::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Tue, 29 May 2018 21:39:48 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v5 11/17] mesh: Allow DFS channels to be selected if dfs is enabled Date: Tue, 29 May 2018 14:39:15 -0700 Message-Id: <12b03c2bfb033c3e755fe6a9f23d87d4694a4899.1527629631.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:bc83:1bef:7e2f:6957] X-ClientProxiedBy: CO1PR15CA0074.namprd15.prod.outlook.com (2603:10b6:101:20::18) To DB5PR04MB1654.eurprd04.prod.outlook.com (2a01:111:e400:5995::12) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB5PR04MB1654; X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1654; 3:C5QCgrXEjzaJjpStVgh2Ep5+9Dv2fYPCZ51sL889dDAnVzZzKtLZuyhFBW2fUp2mViva0D2pWSGxG4QJeFnWR5ZCgyKOMV4bdP7ITGuIvt5GZuaX7WeZAHEmFgQL3yOwrjPPy0CzeJSr+7elGz2l1KLPeIkMxPFE7l80H32IpdEUTZ82RNGFD9w8steDjDVIpc+Xf7Z9Fx+WnIMlQ0haT1cMIkXPW92RWKUbWoQfdSJ4iFu5ObADZER0MxqsUVXU; 25:ifY+hmgsTo8FfdYKoLKnsgZW5Slp/cfK9nKco4UkAyn26j3XWSYCUh5T0siWxc4m8LFD71KtL5as1KdEumxUl3Hmp6spNB3wR3hlJ+MNcFBdrNL0aacWO9hjGPW5GiIPJechk0kwkzMHJhdnlwiFem2pIhH4eSBjxNDD4ZdxpKQsF9+sR5V3Uqnt+2p8voAq70h44XxIiyKzzQ/Evz2vjTwmpUAxzgPGpWUv/2E9SC9BDqSq/z0UuEpqGARAamHpYdw1Ui/FIz6i9iXbqx0ynl/uoITGyO+IgdINLE+T6EasiFgfN+1laI0qzBqxh34m6FTChmA4tQeR/AfYoV/A/Q==; 31:sgo5ziAxHJGXwSm78FCuT6NFAYM9RhwzWHz1Z6Jpn15TA/HXk1mDIC9DFxDPnO71MM+8WGjjfO920WyyEg5yx86bMljP9nHY/iCoeha+85kizzjYlYBB75YY0sNICEHUKfMxMCDsUF92wWfWhDh8MhTDf8AwRgq47KS2SKmIov9pjF0YrgJGIsVNBxm+2auZfgHJMn7/At+6t28UqFrPZahmWHZ8aUlpa0Cr3I8rg+c= X-MS-TrafficTypeDiagnostic: DB5PR04MB1654: X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1654; 20:5S4PyZuphK2XCIs7CmREe8CnxLdZegDgf74V/8UubMh3oTMgXXSvOQmbArT3oeKMEizvKXhDQR5AnwfI+y4xgKx9WabMPmC1n9CyPGgrUByIZisLolzcva8eMzWrMfaNBJzMCl9gcAgGYKP2oYt7E8kWoOKCrHzzhMMujWZG2wwxLl88F4JgJJcUTMP0k6pW6+oGKi8hw0gtIgQ06p+DRx7C/1YowFFbWq9qBKnhF4yWrz0nzgQhO9gWlAzpS8j3fOsj4TlUm/kWkGMHUUE4ZJH/FVStMmzmwkgTwZDqG3/7Yc8UEDJTtkPYn0DrvjyWN+lciqHHek+/jqVl1UXO1FlgRnYDnBke+fCDCpDEwAT45G1tD/YACC2Y0IIfwkzUA3TjqHfRdKsD0j3x6H5DCZP2DT3JfPTzTCeO+PXfzXg=; 4:P6O1ds2umqK1Cg6ZDn28Io7Dij3bHK+9mslLcJfC+oIuIElaEa2VWM9QJtotiyFypP3taGsyOeG9xbJnQZg7Ba+qAxGprTdceUMXswXTZ4m3eKCp2XaSgA7MXaz8jWnnag2On6dw+f5c9ieP/URltccu0FSjD5OrWY2rU+7NEJPE3hKout/aO9lUMI7ldxnBeP9WexRjvAhAQPNtfMtl3guJLXxAoBTIOdGhMSwUZUFJD570d7mIJ9bwc0ZY6VIXv6kqQDAeAah8p/jf5WR/qQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(149027)(150027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB5PR04MB1654; BCL:0; PCL:0; RULEID:; SRVR:DB5PR04MB1654; X-Forefront-PRVS: 0687389FB0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39380400002)(366004)(346002)(376002)(39850400004)(189003)(199004)(16586007)(8676002)(53936002)(16810700005)(54906003)(97736004)(69596002)(25786009)(6666003)(81166006)(6116002)(68736007)(486006)(51416003)(76176011)(52116002)(316002)(85782001)(81156014)(47776003)(105586002)(305945005)(7736002)(478600001)(59450400001)(53416004)(86362001)(50226002)(52396003)(8936002)(36756003)(33896004)(50466002)(118296001)(46003)(386003)(6486002)(6506007)(106356001)(5660300001)(2351001)(48376002)(11346002)(6916009)(2616005)(476003)(2361001)(2906002)(4326008)(446003)(16526019)(186003)(9686003)(6512007)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR04MB1654; H:smtp.office365.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB5PR04MB1654; 23:SU2etazlT7PnCOiMxHBupcDGxP9bNfY83bX5f515v?= Lvil8D77FVXNXfMTdjJZ1U7adMCaQDrK/jr78kQ3O4FtoRmaOi+qvzRRPy9kYB54VzHwJZHaXrNb5hsE/H0FZguaoNkL039ZoopyJRsWWBCwZ1S+HDbYBSBOiKkBQWvoLM+HYRBelZAoKNF8FEill2eIDIwdK9gkIhlxz+nMPgkOiXu25+rPfpLcqxyyRive3+SdxxYMIBsAPiNXGmk4i86LRN9uLG5xU8hUnBZL2JColq7G3HVWrJNOkyPy/1XXerUEa7ane7eTeHCoS3Q3zjpBOOWZr6LGpJoDxcSyIjRgyQeCK6qbf/ZBwwSvxEPyVfML8WXVPp93oXxJMa1VlvzbOP62E/uZaK8zZnc4/vrcJXn52H3qUOoyv2/91PEEAkyyOKDU9MNbzXw+NkjuUnzelsIpbd0cMbIOI/U0WzfRt24YsNPWuqTVbIsebfTTuSJ/mm+hmNy2jCmWjE7FMeUA/5fcOy0AwXyiTKG+QmjxwDv9qn8lj6J4/huaIKjxuqMrVvmKmfKQZibsBuKxoeGFypnglmcxadfxlm0TC+LWbZ8tqw0P4DZrkcJ4TDBhP8l+cGNRPicgsqo+0J42BfHObIMgx/gQcUIC3++TrXKFeHX5BqLvJZvWKEWg/VFB0k4ji7cRXk5IQAorCbbQt+70tRfS6H1MXdrNCGOw/HLgkxZ2llwNje6SuZ/fAPIWWiNZde9/B5LvF6rLtXCJ60Xa2/6vXqliSlM5uo9jOu9v1igonxIvF3VeHTVm26ygJI6YpZEBnl4j0kX7zl+39/HkHTxoB8xVKeDIuq+V8hPMluQYmJ8jr/Rei/HFyGIdo2y5og09PF/nzEeGS8rnExjoFVyh9Xv5pRkEujVJ4Pe1qL0HGnxdnVx4M9tevk4SGhpmc4KGtY4DUtIytvj57ONrpBQU2Q0OYtZb1pX1Ed+A+lQYyUIt9clKSqmf4kjaA+8S4yg9ogvt68JnabnfMCoCpDTYXFb4iv+Elxl8CYcVJ1cKrx3K7ZvJjII1uS1EGZvH/UOTdLyq/7snulrgALmW+joKgK4mqlci0hhWgDn5wi6V95c6Vz1u+h4EQXqbeQAWVTtAbnqhNxp1RI1tS6pw3SkOswZ5IJMEPxMn4S7k9BkgWlVLJtHrpruV3mOVFIN1H0uU83Cl+It9pHnmRVXnI+J+CZ0Tepm2iR7Ynv3Q69pFuans0J8zyddrlTArd0buUNqqR6MlVRzjTT9EPuFtTNvPqRqLXDRMeyJGZvYg9/PNyW4I/B1rahOdYYeLRt2NjNUGQTL/djm/3wopLCXUfWK9VjyZAcpHsH8weS9zYBQuJCf0iKtIov4t7Va6EQC+XFL/uYQILf2AZvt4O5V X-Microsoft-Antispam-Message-Info: /pE1wTj4udqSQ/OxpMvocRlWE8/TDMW/ZoJePUZ0khjsCjlKQHz6yHbOIhoQpbxbKUr+uHpoh30j9vsDv0EI/BTGSk1v2A9RGlwkTb2pZ33mh6Zu4O562yz0QNPz2lbNI0TJLTE4K9DvDBnssMKWrYpCL+SeklwTZWD1EDPcwYDq/wmJWeTDhP0/r8A2on3E X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1654; 6:j4dZJAMsLRsJeiiWIpfDiPRulaOADwk0iLgwMOyzikxvVgqsB/3+EnyUxkg0iz0vcHDPkAiCQXXBJERP0sC50CbYNSZFAsSFavmJ9/82Z1NpT0DokQdeN46baOJB3ZUCWZz7/FzNhrusr81BdWSvXJVKaKr563GfgQebwVOp9tNXVp3szemIWBbUh/DlJ/xwDJavyiKdyLGfDbqd8G78pZfL7oSXyFhliWhpMh61cVRODiPiLYmjVO08Ir8w74sEfzdCKFBO9gc1W5ddaH6TKXzNJXwgMv7+pOsso0GnqF7cFtbPk6wlCiFQvegG/wnWDZtRBaNSoeKVdWflOjHNaDHJx465Ce9IzbZsvT0KrFlXHd+9ANL/4ic94JxHnIAUFR5mscYsyAFMWWXkZKX8piNObHnOhk8Q2d9UCSOK597f+wuIrhxC6mh/pGdzFoROcbIX3AxnLIUOt4qzpNhQYw==; 5:3HQ+VoBIRWzECZaWUjmO2pKxr70xbWBHIpQBn7ceQWJtW3xHDm3ptuzlen4R8pmRAXfd+lpu7Acj3WZBUcTz1aVHjwOoKLz45o8jmyIkOugfIMQU7HDUYRrL4QFvSxrqniBO3Cy2c3+M1QTqhhVnAlZu005R3uvbfS/Gqq1sru4=; 24:zYDBr7ERpGSHU8viog9F7qikVj+Gu/6T0iQOefo1G28ksPinkKz40gXIyqqRKXJ2WRbNUwk40InhKlGmPh68Rlg/fHRWiWQ3BC9EX9a7uQA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1654; 7:zNMHFBVKzQDrQsNJE0duFOX2nGgZRB0YrxWOnE1En9x5QfJlCcahhryTgESfw4q1X7QKp7ouCKfB+qw6yvGwe2O4IQofocQGd4mkKVnuEBBWgJi4mZdhyES+oG8k0Csc90ZDUuKHC/SGb0LML0/bZ+JePivsN1uz9j08zDweP6yitPzquGf4b1W6V7PGs2V8S865uca5evgnd+z5af5XJUcbsLO3DUuv9ByFM8xu49LvbIhPqym9UWR3K6dXupVE X-MS-Office365-Filtering-Correlation-Id: 406d0cc1-5c64-42c2-2306-08d5c5acb453 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2018 21:39:48.4430 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 406d0cc1-5c64-42c2-2306-08d5c5acb453 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR04MB1654 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180529_144022_764092_2D7CB467 X-CRM114-Status: GOOD ( 10.59 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a01:111:f400:fe0a:0:0:0:616 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Benjamin Berg , Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh Note: DFS is assumed to be usable if a country code has been set Signed-off-by: Benjamin Berg Signed-off-by: Peter Oh --- wpa_supplicant/wpa_supplicant.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 3de9198..df71b4f 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2060,6 +2060,8 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, struct hostapd_freq_params vht_freq; int chwidth, seg0, seg1; u32 vht_caps = 0; + int dfs_enabled = wpa_s->conf->country[0] && + (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR); freq->freq = ssid->frequency; @@ -2136,8 +2138,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, return; /* Check primary channel flags */ - if (pri_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR)) + if (pri_chan->flag & HOSTAPD_CHAN_DISABLED) return; + if (pri_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + return; #ifdef CONFIG_HT_OVERRIDES if (ssid->disable_ht40) @@ -2163,8 +2168,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, return; /* Check secondary channel flags */ - if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR)) + if (sec_chan->flag & HOSTAPD_CHAN_DISABLED) return; + if (sec_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + return; freq->channel = pri_chan->chan; @@ -2254,8 +2262,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, return; /* Back to HT configuration if channel not usable */ - if (chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR)) + if (chan->flag & HOSTAPD_CHAN_DISABLED) return; + if (chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + return; } chwidth = VHT_CHANWIDTH_80MHZ; @@ -2275,10 +2286,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, if (!chan) continue; - if (chan->flag & (HOSTAPD_CHAN_DISABLED | - HOSTAPD_CHAN_NO_IR | - HOSTAPD_CHAN_RADAR)) + if (chan->flag & HOSTAPD_CHAN_DISABLED) continue; + if (chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + continue; /* Found a suitable second segment for 80+80 */ chwidth = VHT_CHANWIDTH_80P80MHZ;