From patchwork Tue May 29 21:19:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 922397 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="SM2RZTLZ"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="bd6K9L9k"; 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 40wRVb5qwYz9s0q for ; Wed, 30 May 2018 07:21:27 +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=927Z2Llw1Fe42qR8nbrtWNMnFHsbTYPc+Y4shbqUYUc=; b=SM2RZTLZcl+G8+ HZ0yrNQ1zo2sHFbp8X85S8ydCHtr6Y9Oqvz7cvFbUqM3mz2mHK4XxH5sZMcMMA7i6EhgdsGxWY2nH 3w2pE273jA/8mlz4chvZIAa1yoScyHVkIp7ZChvkZg7n9gi30y+eOgGF9/F6xCeoA5DqhVIOmtOBM fztBBlkhPom7JoZ63cr97BH2EGOS8ZmHGOdpFyu4E2dYqEIFMJuxKaKxnBnowK8IE2NAorK5DUDuR vL3cYG4DmPh5xZwBuLeb7S1230NoSq3e4I8SHElKxXUNm9iaxRM59zdDXPunwjqQkSSNJDahynZ8R 9FEbMXqEMERaqMmjl+1A==; 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 1fNm3S-0003G4-Q3; Tue, 29 May 2018 21:21:18 +0000 Received: from mail-eopbgr00074.outbound.protection.outlook.com ([40.107.0.74] helo=EUR02-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNm2I-0001Ja-Ed for hostap@lists.infradead.org; Tue, 29 May 2018 21:20:08 +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=/Qr6aqhgbzRGu6yNd/xntXAqoX7rk2M8LRQFwEeEkf8=; b=bd6K9L9kh1M05vnifIqT8UZARSuPP4+52t7b4Hu9TjJGOrcnW+9tmvFyj5Y54Od2QGVG50iqEzPOcWV0xNRkLyQjAp0N25n39WXHDU2KnCpulFB5XXGHDzBLCH0k2D+7fZYa8bHZU8u/9ZrXQSrdS9SQSuTScUmIT8C4MxreQYw= 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 AM4PR04MB1652.eurprd04.prod.outlook.com (2a01:111:e400:59e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.797.11; Tue, 29 May 2018 21:19:48 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v4 05/17] mesh: reflect country setting to mesh configuration Date: Tue, 29 May 2018 14:19:05 -0700 Message-Id: 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: CO2PR05CA0101.namprd05.prod.outlook.com (2603:10b6:104:1::27) To AM4PR04MB1652.eurprd04.prod.outlook.com (2a01:111:e400:59e6::14) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM4PR04MB1652; X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 3:+de1DX4KZepBLmGvDYEsM4iuqmqyuR9ysdL0l7JIdRViDr/UuHfInU9yonKHzyNUafEMCSpkqtIQjqmZ+Us/BgSNOJZb22Na+mTCjmG3CLn7gvy7QTr0sufUEgtrx15tLU2jbrnJjiIc5W3v65tSiBq4S2kbXE5YpFB3HKcWo6jVLxwNKyCpo4+QVQIWTPZhKFcSSkd0FkyLoqaHnFuMjCPVLPw+uJZWo5iWtihUHAW/fvRuC/eFKdr9HZ4Qtu7F; 25:vrSbSDee2EFmE/BpLC3KK8dkz0337MBG54upgTtGPGR6jIgarJv1gCIYpNTwWEQcTBL9baYDdU8I1j51z6F3JRDEFI2kyn07eab+ETuG5Uf+AZK7EhD3VD1TgOElYEy/As4BX1E6xmyAXk1goWNF3/2CF8efUEO9OBYdLXGdosRjto8w47mLp//G0JJOURky25zuSTdZEEHSPulW+HESP9Or/P3C1TnNeiJS5o2WC7lcV95dd5MHifjH9Fq7MP6q9CdAYED9Qf+JoklFBXKUKfi+W42hdkSIM9lpsaULqmONN/B9DbRrEBnS/UHcuLaTyiaw99vKzQdAIViELvgX2g==; 31:k3Ftm687QvAab7gmWm0JVmjei6GRyKcfP76QicxOQCr/qHfoo9y1+qHtawJ+7HqPE6o1gjUkYjhj8ibCxGeeJOSpE3TV9ouBnw8agbumFvQCDDpfZz7WbSaeJEb7cNtsCxkfBAfHCoyUYtRslwrcSs5oDHjvscw1qsprH2WbF1wUcRbNyyykoH5Fs1A0AGaFcoCQetUVTIQH3THlwqmgzBK3ONE7FXJ2tjO4KttqI0A= X-MS-TrafficTypeDiagnostic: AM4PR04MB1652: X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 20:NL3D5JAD6CA3eooHI/tBWrkeJc78q9gkZ2iOyjzvxhFIP9x9Tb3VgSw3oQbt/WnMwxb2SAYHKbYKuxbyGtPefvK70wJG8hG89o//REL2AHiIt1Gp5UwsKMYKqXYqWpG5017q2w5na3j39amEIbX2jdZ4VFW6eHVc+UKFVLPdx7ZY5bOzWVz6MtlJ0aAOQpeyisinogpbU2/+3FpdTBzBT/j2QpKmAMmiihMwvcfiTkORI+FGs5tpeRVcwhkcuJ630as5J2t1c+3WSLG6dOwj+Sot3paBT59U+2g9npSPLr2/NXUCuf8shhdt1v5kxhpzu4Bd49PoYVUqwZtripHF0nCPkNKGrTfxv6SeJkuxqE46uORiXuQAIcnTkRTrEjVhlS5su4R7tTsdtJIpfjIhOiDDhP60DWXXUCuKzV0YiD0=; 4:xvmn9fm3OLILiHC7kIt3RjZzI+Sgm8TQynAqMNradgbTqvexxZShb8GLUVQE3pYSYr5XDFc4GyccXrqF+M/FujsDqp89hoqMeJaofTKdnQVLiO7qMP1A6AWInf8XOmJsDUjqV0D9yNaxw9ftKXro2jxpTZQtWmkB+LtSJfWr7IEVTylBzdR+jHUgZVGZysMp2ojW3sGB2omA9/Nn//DPA8+TvM0ovW7FF/VoJ6hT8W0HHXKXKUpyjc9IKdQRMBhSJrvBHQZsZYNpXy+vMxPRvg== 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)(3002001)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:AM4PR04MB1652; BCL:0; PCL:0; RULEID:; SRVR:AM4PR04MB1652; X-Forefront-PRVS: 0687389FB0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(346002)(366004)(396003)(39850400004)(39380400002)(199004)(189003)(11346002)(446003)(68736007)(51416003)(46003)(486006)(4326008)(2616005)(36756003)(69596002)(33896004)(2906002)(107886003)(6506007)(59450400001)(386003)(76176011)(52116002)(52396003)(85782001)(53936002)(6116002)(25786009)(2351001)(118296001)(2361001)(47776003)(9686003)(476003)(6512007)(8936002)(478600001)(81166006)(86362001)(8676002)(50226002)(50466002)(16810700005)(81156014)(316002)(97736004)(6666003)(106356001)(6916009)(186003)(16526019)(53416004)(6486002)(305945005)(7736002)(48376002)(16586007)(105586002)(5660300001)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR04MB1652; 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; AM4PR04MB1652; 23:8ugYV6SLVIXYs8AqyPPck5sL+wbIDXSYuRIKo2B4h?= Al0MgmPwiozUyM29jKvm5Ckn2MA0rV8EiYdO89+qpMF2VoGUO0D3k8eHZOugt2fPxOZmE0g6e5myvthlznDjb8AcQSaxhFWKgIIYKD6EWdA26K0H6wQ/JE0l0sex7sniHiOZQ5Z01FFT5aim1J3IPszD5fKn9Z3Y6AfnCmx2RUSAxLDUsJ0efTy/Yyns1oplwB6xUIXxtjPBeXTprm0+j4Z3F/vlVsza272orr95CJOVAwd6om88q/YrSoJZu9d2kbaHwRaVMVR8uMZOl+/Q6tuJ3tNeAHB7Rwnb7tsRXQhCCo6Vv3CfkBcUXg2UE3wcC/nlyAwx4uS2PUIjarvQ8lkKxhq3fo1mKlhiFmuvIEjYL6GmDLkbjRACXebaL0rC515aXfKpPyLwEzf9LmWzCZxEzXo3V1ccUbhqxXGyzVSu2iH1E1EvghrcKwU3xu+j5ucgOVxoo2yfQzjV62de5z4sf2exd9oBHDG8mGca45y0O48skbdU96NYJtomZiIeUQ7piEL/odpuDQuG5sKx5aSI7jYoYy/bviAS3lNHalyYJ2bWDoM6PGi00wHw6E9o1pq2fmxz+qnAH0vFxdbe3mh6r8dDiv13KpcBda2FtUPObjbKhs1KSD8f2YlmIoWk8uJYbrmM90u3CVrGjvEnjYyt1zrbxi9X6N4J1ravNiR0SiCcVUJQ4lHVKwzC4+Db2kIRdf80kh+GqaEIvmbL+4lrcURgosNbb79M2ZYOc8gqPM+UC7PSkxlJ+5Dt3M2jlTSdqW1FRDMIxtsk9NcU7kdO57E8D7rDRSZaO7HgZNZxIbGtXIuAGcsLDmf8GvPDbVGN/j3285eGELhj3K4QgSVuVLJXQp/kFPT8uXwq7G8yROvq31kMub3AJhfpBLWtiXEMiUOMhimWfr7gMlk9ZaJvLswTY1tYfkivNu1Zb6KBreTDgrjOJ+/0u0q95mYbfGkm4OHV3voeI1IGpGWt5wRFzx11DOC73jNul2xWhXSpIq/yG8ISlSOZcy2dwoW/5WOdKfUQn5TR3AQxYLbNwRLn5uqokFofmUuhnZ8YrzgqXqoEU/YiBA1oaooNSZccEuWRHsj974wOVC2bcU8fzSNSMszNUolllCFZclUpj3SSNZFFP//e6dAEWNBFwevYH9bWbOg6mBq67z1UnoHp5bMSN8Y9e1wwt6LhLrLSjheU+8PNePs/l58am78wsfQEZVYhs0K217ShLy66jo+f5PCxQ9uZ2gyBxkjsBfJuB5NpJIq6eyjeZV5XS4N1HPauYafayk4esFQ63oNSLy9XnlKgUVvOE9DoKNcaoig8zS4C2gNsM3Is9hK41W2glgsCrHin1kGkt+Ngit9GhoGp8RW X-Microsoft-Antispam-Message-Info: z5EAkmqJAZ+tXjfxSqPlI3fdeBh7MA5w7QvQGT7Bg4VQ6FD6Uuhr8qowgo+Ih0gozdp0OtCh4qIzmKrWyC4lmqzeBMYWQD7cqqREt+RPTvPYj7hE7QeYoNxHfMXpKElFZL9IuZ5un4kzBNgbBgiFRpHdconPAeVc6cE3gkG1nNnuhUrniQpYLtcgeIXX6S7l X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 6:AerRS8TpPgumOSdO34ELkMTdLsWV5CtDKAiWzXF9GKjyRNASpHf1+7oEHujj1dccC+nE0VfjwA2FNgUFL295Xu7Msrga+RcKX2AzXQGvsk/qGZ/8WTm1eUHttMvjyK9ZCPAKpLJzgOj30UXkEFR/fdVfWaQkXtRa8fOZI7uRATPFRQM+9RJV4NOttKAAOr5pkPODNS+qzLl145RKVFPmjPyeJBiO8/7UhcDLGGeBZIWpD/Vu6VZx/CKxXJhHkokkOAqD6wLCuQxnfA/pV1P11Qqb2Fs85y9DWz6XYtuOJ6DGHuhXUKox6rzigPpjhiQYDdurdm55zdgFPaFKMAAJwQ1+eJa3+0sNSQH45fFYzy5iqJUbqLmQPWwtrcV8MijhUAPcekIkomPJyvegbtDH7cqFbBd7RAvZmJKKFXj0m5fpmHrqlAeBUkDE9TW0Ig7gmuLa6vp/wggFg1r40s8Dew==; 5:rRs3Wh2AqwgYt9tDixJ/zlauj7VLKUuJfm7yqFXjeG+RZaDfKrc7zdaFhSpJEQPxqDPf9+Ngq/k0Kj1StHozgVhF3CoI+hio4WOz3i9asTrPxWHiTz5m9pRVUEGxSRpFmkAbIPzTX3GyYpvg80vQ6hjucPHItMPk2FB7mFIJijk=; 24:PBcRnFDgO0HFZ7IjrXlzEd/6IdDbJhGiXqFmXKH3qjLGFXveTE+9nny914o7ZO/vO2sSZg3ixIgoQEx3SE6FdcMj3x48qk5IPPIjt9zznhA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 7:kO2y/dvrQQ7vCDMzHxefXt/Fw/SNWhXiF9oJsweNebf/4j1kjaAk9xiOTHbXKgjRXpNPlmjJXkOP3MvcEWdLpQJU/VsP+eyAxTjpnaDSrpCI0HszWvmpMQ3V3HoH/Z/L7JMUo+CoJyq6gjc29d04u5L3GNBX2/tNlYl4rzNbAuNAZTN+1tUCRUZOkpzAoMQpO4ma1nTOVTZQyDjcy0WYZadauEuXEEomF0H/3ZDpcPoLfJ+j23UU1ajy00ljDQ1q X-MS-Office365-Filtering-Correlation-Id: b40518c1-0677-40dd-d16c-08d5c5a9e94c X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2018 21:19:48.9978 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b40518c1-0677-40dd-d16c-08d5c5a9e94c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR04MB1652 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180529_142006_527023_EA6C79A0 X-CRM114-Status: GOOD ( 10.11 ) 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.0.74 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: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh wpa_supplicant configuration has country parameter that is supposed to be used in AP mode to indicate supporting 802.11h and 802.11d. Reflect this configuration to Mesh also since Mesh is required to support 802.11h and 802.11d to use DFS channels. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 0bc2b98..f457615 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -255,6 +255,14 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, bss->conf->start_disabled = 1; bss->conf->mesh = MESH_ENABLED; bss->conf->ap_max_inactivity = wpa_s->conf->mesh_max_inactivity; + + if (ieee80211_is_dfs(ssid->frequency) && wpa_s->conf->country[0]) { + conf->ieee80211h = 1; + conf->ieee80211d = 1; + conf->country[0] = wpa_s->conf->country[0]; + conf->country[1] = wpa_s->conf->country[1]; + } + bss->iconf = conf; ifmsh->conf = conf;