From patchwork Mon Aug 27 21:28:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962657 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="fXZpnjR5"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="by8IwPoh"; 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 41zlXZ4gSRz9s47 for ; Tue, 28 Aug 2018 07:34:54 +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=2/tIgvUsjg4P1z/ctR+dns1dhB02hs45eGPW0LBhL48=; b=fXZpnjR5aOyf68 WkIVVdgyt/p908+jRaW37p3futf04MSF4dJEGqTkTj5mQpDumXG55+IqUdywcnTyANwEpi0mx1xIk 1/eD2zf3/ckfrgc+FUgQKqHKMprk7YwHNRQbVc9NidI/Nw871fJU5pAcfWy7YW+mm5QFouC8hCJCl wU0/QdaZqjM6tSgsdjXmx3W1yMW8nDDnqew8ycH8byUe+b3eS+3F5Exl/hZGROybENaMX1tCMvqB5 O/qb72Al2ewgt+WmfBfUhaFvbFECPi7saC3V2izqYPC4f4E9bl0RiaDGyoHzesCxyvUlq5Ms9JhFx +nw8Bd8y3+fmSD7HH2kg==; 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 1fuP9e-0001fY-RK; Mon, 27 Aug 2018 21:34:34 +0000 Received: from mail-eopbgr50059.outbound.protection.outlook.com ([40.107.5.59] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4k-0006Rn-Lb for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:32 +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=/XdHG4xxkraCt3scB8+cG3D8sSntPGv2NiavyXRwyhc=; b=by8IwPohgbcsZnRI/8wCZYDFXLXoD0Q88L+xM9scH9UlXCNAt5Vii6Q5Ws3znzAZMARS5jHwBtY2cu5n9W8iwsNbNGCJv3Ti7jyxo2hkKl2wR4P1Pi4k3QDSmR9rz8erkiThYwLgzncsjTBREXzhE80Ggp3UAta7P2mPW4Cnf38= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:14 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 12/16] mesh: Allow DFS channels to be selected if dfs is enabled Date: Mon, 27 Aug 2018 14:28:45 -0700 Message-Id: <4f889807b2b07973f5bec68ed73c0e3dd7061064.1535403927.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:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c64f1dd6-8557-4cd8-e961-08d60c642360 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:UMjOw8Wff8KpYC70Tzzjtzxgvq+yPumnL2QVeuIcsMdQ2DI8RJz9UNfWIZ6rRm1rfeSh2O/lsdVRVT8i1vG4IQyTw5NeRcRA9/HjYdGOgTG+dkOlgozFvrLWfTwYwOY2hdy3Fgz7As/snUEecAWp2EBCxtgnlK8MsoRhkxA7MCUo1n+NLnfLKdzYeUURX8UMa5u9zA/kFJDJXPOLwT5aDAjQesGjciOjTQj+Qz4z1VxHWvHnNOTqIewG3a52+bu6; 25:/OMru4buaugD4BJcFuFvbZqEwFaZjGVj6Ub5+pQjDxfJhsGymVfXztQ3aisiCB1sz/mH2SdTvX8rj30BzZyht7f7jo/fXNZBBg/RJdrmmbxVlsUkMbHNoGDT7mi8MPIyOWa3at9dQT+y9xiF4uuZHmqizliEq/Kph6nZ7wJ3U7ywrJCsauWoyw/tvRdh68ls3LxXDo2VOeeTKB6mTOpvE876VVkNcbKqUgh3rLpmiH0fekEBma2FJ6DATA3g4lgtEV55HZbJTyXX5Uw/0OmAAZf++/H2u1VWV8fhmMYJ26WxI6+YIK3ihSN2MywcVSD/8qjVa+lXrYmlgp9jy+66HQ==; 31:zxrbzX9EIgAWFkIWZeSw44X2NPXO1IkbJQFCj46AZjgAQ8bvVqGY/ONfJnCpQDqBUL6p6RfHBF1CUp8BLhGxs8Kf6593RbG/jCmDpZszX895LRfLOxKUUbN1UmxG6SXaF1PkwJ2I3gjis6LjeIrcgVTpcYLHWERUaWgDrIGX/wsn5ZeoL20GAtC2gWA6Q5nGe7whHFaQY3QkT8En0dYvMXb0vlDtXznqskm08pgMX+o= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:5kDKnyjoLyObDoedRv6tvISKfjJoz3N5ue3+EZ33G4Pfxrl7HS4AfoOP37WF+UKnstcpMu/0rke5oxUdjMquZ2pmaDlu0okF3VPk+JIsa/vhkq26HsjAUlKFw9WwRXmWS1XbesqXYvnDOPBRP3THW34Y9zZ77Rfwa5M+nFcuO/YFhHCia5ABnrxJcp6L7lpmfT/wJr+DVRphuf8HJn5VGM1gEi2JnUIR3Q1vZJ9aSeP6884f5YFE5vRMxFGHncc+CfoLMQ5EgBqpC69D0bNm/T8Fm35oGBNh9j5dXv/eBNh+P3zmJUvy7aALtFgcvWVIvz8y6lDEdKp6ChtCjD/YOPxsSVh4ZyptU0EMTnI6KsFgYrQNwvpEmQjeWXYPNVHeVqMczMJmYMF1JnSn/HQ/cg4O52IATOvQkgQpqeui0VPhbYSfigny62a7OYP0Y+eiFmr+41/nU4O/MxlIukeozIiL8rog+IdwH2LMg5+ROHvU4PNaMnKmbDRrSTNNl8L4; 4:NJj4/AqtzXoNiVf1p7C9hWmpzSXpHh09LTKqCKnbK8U4hnCdIRVpvlZmhx3j0wfqyN/GaxN+Qt5WII3haVOF8RRxes7Weq6bpaObaxtqKtgW5UERlH/e/IJqxyURtCzRRF7gDIKkeK4gna7Qu9lx94bTN5lgLoOPyvTZ5llvkrxNDb4N9L+BEbgOGv5uu9uKadb9w7G+ls4ZsPZ66rZxA3hEwFZpKy+TTrGkVsj7EPZQ4/rh230KOUSyzyFmd2FDBGDNJSm44O90ijVtVYJ8kw== 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(14444005)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(54906003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; H:smtp.office365.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM6PR04MB4151; 23:VM2F+ZOCWFxEXxbvDpLnrytC6HgqJ64bGTeCi7iQ0?= D0omoJL8Ks58Sr2/QzY/21kpLE49ktUj3AE0RhkfJJqmIg0ljymSM841aAIaOwQsnbZvIM8wvkTyTLdn4M2WKQF/tFS/1JRLY8oK4thmPQmFW8WlyHZedugnaRrut2BaXVLF935Tcglp+w8f7HISZYCN85IqsvGJAwvl9rbBr0uraespteV4doBE/VxUl1FGKEom9H5w0vO/DikDJfcAaRff0cd7Th74PS6ZBeZiuyUTveYeq7EIkpRJWk8zxa1FPAjNQgusPoSai2IKip86DSUxo9epJSz10iabXffEgcySz4/yrwH922dw7riTl/pRPd3QsG57w9TiXzP4BLnmt3HVlnZPk/vane4jzOir40dcsJBv+e1AkL0iinIq1rsRrEXqSzwzW2qLGbrHMkqj+t7IhhheUFbGCs2lf5LdokaEvv2uYewCVXh9DNeKBZOBM5eYwMRhQcCQikZ5OzutySMrFe/vC4gI1OIDqgNZREgtuE0hGDwkEsCPV/zcnU9XORQA6gG5D7/2u8FJEfHhsBOzb3bJeCeY01ZMUoRv7ftp97OhuFNmk3l6isP3EQSXVKmRK0BD3UvU3N2HCZB788p/UjiMMQy8ZvRRyqm1stQMRfVQHTJhyFM8YvGmrI4zUqcNeWxdjkxJb5qUisGL1nWJmVS2XtOE3eX4r1ojXL7bIcjjk0s986Rbuv2hbZCyjmTTUervy2ABIYCc8PzMWFaIUIDhmHBBDHPxpIgy9pnLJmGYbvNTXHOMo+X/jraiGCJIe4SKHPptAbZOaXJhS4JMJfLV4A8CRTZjZ9WAZFmpMXcXwOm5PEyOn/bm25ayPIl21gU8M9vO4YwpZX0+5DPoMH5ZXM/K2y8+bQe5HHQOApP3QTH/MZY/0BgXAx1ut28rdwrF04h6AnmrBJHLdnk4WY9J1difeglCDkNvPDkc6VthCwUMsnUwe/+LStBLzi8SOpur2kdv1A+qzmTbCngkmQ6aA/4j3E//T0m+LEnZjHhQn97WcXCRCAjdsTKSFKt48rgmchm6LeVt7rFj79PnIVjCpzhUMJJq9yOzg23NoJbmOFiXcy9CQFRABP51mCGKItm8BoU0MQ4Z+nik+aMveC6mBS1Q5nqzQAx0HaJGpQpjOHLX+mMPfDwRn/wrjYQ8gmZvOcaQR/r0qVa09PdRJVsTg8kat2N9+eGX0rco+gJ5dAuzEDSABTUrY8ej/ktG/SE9JxvBFgyl47p/ldD2V16h3vBH+Rvlq+rHTe6Wstjl5uM4DkIzSiBOfY82QB9eoyRBLD4dB895kZO78PpIBEPph8t4EAaJWc21OLHUDCNl35ooYTDbjEywonFNyo= X-Microsoft-Antispam-Message-Info: 5BW7oVbwwR1CJTx93dkW9vOgojlbcgFdArMOG3mRk0l2kfaTGgK2OePHwTX5qMCPL9zyldo7ZSdf9+IxKm5mzW+Ff9KQ+qGuqWFi9OZsjwmd+GwWeVw/NP51RV+HGPLbzm6UxqbkNa27GcRUV67zVUSPHkCHOpq1a1132BI4L01uRGDfj1jCHoyZ+0h3338NPgbGjKWBV8Ba4peN3RkloyTuF7Rq9i/JGrFN9QKSXYhnsCl31v+4xuT7aoHt0e5tJumN9VyQRJ4TptLqc/zXiFZhDdl5Mn/bTKmc+5KjsCtW1/wGcaPs5sU+QSyyGeGfd5rgBStcnmb3RqHt1Vs/hW4QQMTog5BxEoLw+pfsNJ0= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:W1vpgVXJ42hA6uMymoQa5991Nk6ZaaLz1YQol5vPcOSY9skkCMWvszOMQRym/6rcUwNU/LAbbR/ycL2KCdfI5nEV+Y6HM/1EqRWg2RrLKx4qliVmeBEgN8fTR9dS5dkDAJiQ7WGM3vp//yOr4MNUvluboZdLwuxyuqbn+CgNy/ydLLqJ3R3ZkvJ3rg/Q0+YgShWYsWm9XwuczJUAY/QWR4XxQGRM6VG7Bo/gRs+cqGNTYk6ZyWrfBIe+i0H7C0WCXUO+hzs7BRULhQNb6uaoPsir/HGf34owU4VkE9XAuWzYgAQuZ6i/89a0xabqK8ydAbM61/F3DO05NW2BCC1LylsJZRTmTq11NA23oMkn1eiyAaYB0oCtJ5/eVLR7yLl5EyZrQywLHeMGOq85CvFcaQVH4TdfTlFhE9CzfpxzAGpUfI85S189Xz162YotPMi5XZWASqZj+CWZkwtn8rRC8Q==; 5:jAxm9lX1redf/tv8wGpdF774u4c1pfEi6i9kI9swjN98lAL5eA1Yd3gEbqtvwlw8j+B2DLHnm1iw4JoeiajVtnvLSqZmJ804AATi4Xj5GUPWEbQOGwa6TO2vt6zIKFZyR7wkcPv8YCSeX2HY7Y9hpTQ1+Lw8Y03taL+9nDbTVGQ=; 7:p4hG3SR9lduS7y3LAmkmv5sXrWG5ATcpoO+8frA6nR5FVniEHwHZ+ILw7uqz2sx/P6tA9RHUjFkX1oxkJa03O3585XVpy52RSqc4SVzEqwuzQ7ervoesdaWmzVi4uXlbQlTMrLFVnxTswNwUzFxYnkMw5M/GwIDQ3mqd8atuYfUDBBc5PNgjdQu/AEU24gYSTBkR24K72lleB693KHIIHTOUauTNCsIB5ct5Ku0eDMCVfHtz3uPHzEGiWAmyWvYh SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:14.0794 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c64f1dd6-8557-4cd8-e961-08d60c642360 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142930_830118_4A06EBD2 X-CRM114-Status: UNSURE ( 9.16 ) X-CRM114-Notice: Please train this message. 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 [40.107.5.59 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 8bd2727..fe4e48f 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2087,6 +2087,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; @@ -2163,8 +2165,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) @@ -2190,8 +2195,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; @@ -2281,8 +2289,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; @@ -2302,10 +2313,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;