From patchwork Thu Apr 12 09:35:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897566 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="L8548EAn"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="bdnl7HS7"; 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 40MG5K1w6Bz9s1R for ; Thu, 12 Apr 2018 19:36:53 +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=ca8r7R6fq6k0EydECyF4PzrEA+ah0bY6nYASMQ1yFDI=; b=L8548EAnavSlx9 oiGIa07luL7hTWUbi9S8zuQrTTVhvqbE23bZKbLyNPe5qRqeYeFzG8KGOkvxVUYIQMNYooI7PXgEk gqiL2cT7nOfSUBmIglgOmcdK/gQKmT9Lkp+XI5PChHFDsVvJ9jWEwy67S6JAuYpXOikY1eOZi3yyn /NSj6jtZ9NTlgcpXiBSJEbFi5laRwxY44iM2R05t7j3BIdl/rm0f8PUCDhu2FdxDN274o8H8//fF7 tQDUvfkUGv3pOXAbe2qhHiR94QCb9hzyoKP1kfw6nls+pVip8KMOlqEc4lm5BglQ0Un5H5kawXrWA jRhxiqSPGUyVtYWTTuOQ==; 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 1f6Yeu-0006HV-MZ; Thu, 12 Apr 2018 09:36:48 +0000 Received: from mail-eopbgr00071.outbound.protection.outlook.com ([40.107.0.71] helo=EUR02-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6YeE-0005mT-QH for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:36: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; bh=1T7dvEtQS1a+coAYxq4MQtyf3Xu8Kohq/CDE1x4uTmw=; b=bdnl7HS7oAIfE4vzHLgUvbCkcO41oAqKHwDyUqY9Ia+N8vywm4WzuNwK+PIBdFmQEnaCuQaTMCXnrc1VmVd4BHjms2DpkY5zvCfIdxnpGMJ9KWxva0wHUKljXHn9lahgDwp/GMx4+oRnh2SrScY4xeCvRGEisO658EfPldPGESM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:7904:f0a9:f202:eb99) by HE1PR04MB1658.eurprd04.prod.outlook.com (2a01:111:e400:59aa::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.653.12; Thu, 12 Apr 2018 09:35:52 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH 05/15] mesh: reflect country setting to mesh configuration Date: Thu, 12 Apr 2018 02:35:18 -0700 Message-Id: <1523525728-32743-6-git-send-email-peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523525728-32743-1-git-send-email-peter.oh@bowerswilkins.com> References: <1523525728-32743-1-git-send-email-peter.oh@bowerswilkins.com> MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:7904:f0a9:f202:eb99] X-ClientProxiedBy: BYAPR02CA0015.namprd02.prod.outlook.com (2603:10b6:a02:ee::28) To HE1PR04MB1658.eurprd04.prod.outlook.com (2a01:111:e400:59aa::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:HE1PR04MB1658; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1658; 3:V3NJDzca0u/xSsGOLVM4NL4c+VUy4OGodcF6c7t2pDjRitZaQqKbF4teoyEkF1M7mu2p+8sz5dTYLtYm+bDpELtOPl06vQqe9vH8PSmXab1al15u52FPqg+uYr2Qd3hP3Ijac77y5uq1ArHgae0PW9YDveN+FvHaeQIwvDf6A0zinkG1Y8aDxSnd1YuShV+r4343OB6pBiKe23ozai55BIvbgLOMPv6hunODV0xXGM1RDPtB/ar9c+mGjHI5cMAd; 25:YKa6BkAF4w8QcXYlcaKy81r6hGUsxJLV3ynWl17LlAhPbWqcFzkZNoo+DSi1eGLEmBomJOxWFULozu36FuQNa9Qc067mSSoogaDfZcDEHen159RGqUYhmDTZLgQnaycKrerI1W7x5nQ9MRSqFuI8vMuITuuFL/tTHTl9g4TgxRNi5fttTSdJsUz95Tpy2fgjsRI266buG/vHQMyv22WU6vYjZ4GwplOMTmw9U9aAuGJjN2PmVKwuorT8f2LhH06PekE2MNN7y3pa0qgbfWxlZoTB1XG3FFPjGdekVBuukMMWqpJdXkhdcjTWN5I02IAkkSj27ByiMLskvwZegOzgRg==; 31:2q0xNNtWQJXE9RwYfrp00JOWjecHhAgI5Cq+D6mrYdKQXn118oCgsLLfYZ7X3yT0jIvuNm+qkm4g5x9RT8FvJ+L+ymsvJLCzIkGCAfplIa4tMaQZABqbFrSAq8XyAJtYdBsWhpPkFd9Y7qjGfhLjxPoTN+ONVdCazkYMHQohPUU104abwT+JosR7cNo/xko+ueTIn0tYVermZh96kP2ySZXmRDY8sqnu9p95q2IyUEE= X-MS-TrafficTypeDiagnostic: HE1PR04MB1658: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1658; 20:7MrC7nFnudQR++iLTcuPJ94ZJmGPks+mU7Ct840GkH8nHFQaAfVk4EOjx3CWUlUETH8ifsz6a9oMqFX0P6yb4mb9VlDKuXhmccd1NtO38T/lhbnRY3s1cBHMafdJTtv/c7laoPEkSn1IqOUGmPHuBqrZeivozvqtzAJNuoKD2C/yjeMuILzLz+CphwYyyb9vOmi4DwqVCkwtxpjbGEga+PyOQAHfz4zYl3sqQI7TqiXsPMOaBvsRU1OFKvjZFLoiGOyD0xDwAGRXYXq54AiATntRTZJNf9Xf4B4FEoYOvHA0iHBLaFzgjN+UhzjdtRABdqBJtpO9u8jqZ3Eee/MZAw==; 4:NMv4hth1Xbi5ey0EVn3ZkaLqArcza6IU3G0e8mOEySg0kUiGCfgRcBeNG4QkwCQCylFc7OZ/D8qEPN9j+vvWWXd5klKzskhsePaIlzlbMwuSHG8OnKDAQzCWmy/Utt3wLqPM+vf4tU7MUKXJcLtVfyYZFQ3IqKfq2F2VY9VV8K34KSfMsPGhT3oHA2Yzup6jNg1X+emw3ltp0TFIsP/bOTF0j0VD9Yw2yrjYg0YFvfcNOhf/0Iebf92Wbqzrp/2SRKLT5yeReZ65vfk6QIuAzQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6041310)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HE1PR04MB1658; BCL:0; PCL:0; RULEID:; SRVR:HE1PR04MB1658; X-Forefront-PRVS: 06400060E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(39850400004)(346002)(39380400002)(199004)(189003)(16810700005)(6666003)(186003)(47776003)(16526019)(97736004)(69596002)(476003)(53936002)(9686003)(4326008)(6486002)(6512007)(25786009)(5660300001)(486006)(2906002)(81156014)(85782001)(316002)(86362001)(6916009)(81166006)(8676002)(106356001)(2361001)(7736002)(105586002)(53416004)(478600001)(305945005)(2351001)(68736007)(52396003)(36756003)(6506007)(386003)(8936002)(16586007)(2616005)(33896004)(76176011)(59450400001)(52116002)(11346002)(46003)(50466002)(51416003)(6116002)(446003)(48376002)(50226002)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR04MB1658; 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; HE1PR04MB1658; 23:RDqDQScMtCO0efIBNPZczpe851H6OyIj8JuT2JRa+?= 54KRT7sywFZkZKI1v6/PPS38s2evenPMOCCrARqqeEoRnc8jUG/Kzc67ShhaYKAx/eKabwyZeTFPyDLRowP+/NNUuJ+7iGsV61IpqrvRWtg9jZAK+QIikXm2ya/YfjFerXcm7DA4hn+WDz9BpoD9YVCjvGt7SVQj6F8RCbY8J3Dg0oUYOKeuOaPbPDB1uW91bVtA2tJ5TLuKfFCtBQnhyu4MnytnV/NpJRQwcjvshptFg9TBMPHvnbCZ9grSin6iP4oRSv6qjcXZPFkjxTj50QzdkL59j09w3RXl7+tVV38svrbUHZ9fJmq3A3slrEbjfAL3DUn4mgdG/2Ss5KYRs8If+Exxs9tciNJBvf8U5YmEAvTyrwUgfKiS67h5l70fqV+jj1jrQl/HqAlNCVy7hDQHh+IX/C7LEsPiJI5hMNdAQLSfXirD0rioa5K0k1wg74Xj3GCT1xxxWGVxiZ5miSXbFnu/qDyKAJ7Uiq6s4QIPmUwf/E6A6EQm2DPaB0qLlnN4CjWHazqvppDWjfJ373stTrR/oBiMaHVqmdhu++rWotU7a33fidi6wVB3I7dRbkSEyxJ69UM2OIAUiCwZFyWAFEJ2WdLjO30jG3hya6j4vdoUQcfleXdo8M7rx1MBcwBrcgbpe7vzxNcK91rvdNi3DJwsdbMMcMaecs6+f3ThRDiVpvdy6aowXBQZZoEIYSizRhUai9Qqpg3qI1O1JY6BZj5Nm56NKjr798J0fxrWiFCiQCKc8NRcymxzc1kibBUV8/JvX1+Vt+h8bF1Jxu2SlwPJnYcYCtnbW7cdKYkePFy8idmZ9zfnw6EFtDF6EmhyLHMm8xYxjl5Andn4y+w2uVThSw26kJASusISm96p9xz2DVMAOShpiKS4vLH8+uXAAO0I308iDF3eucK9HwEpHBXR1BQfHGxjez1qNp5lDYGDV2vxID3ZvgYWggQ7NF9RZBavHYkVzRRn8UX2zzOBQe1zz/1lWl+sBNaJrYDZwVAS2R/v8fXPNkTEQFfipA4Ss8qHRv0NiN/Af7YULxSVX/cBnDX0kehLGE/63ZwVfTn08WelX/UlGF367HRbrMsDtPQiMSEdUs6PXIlJ9rjMt/exL0uISUWew6krV9bZkAVMKfdVanb65yWdV5oJTwjaF5QyCsUNwnpeJ/zSFBAb+ZDwgQrZYE8U+GotAHdmqrUZO4XijZ4bJPHK5y1Jd6UBVz6yuQOzwfUMT51sSYf6Mt9Vs9AxYMuWtWzR1AlvJyGROl6fEcz80vbL54MeJdAtrpV2c4YwBuXxjq+/9/5aM/86Md9R4gVmaGunu8YfA== X-Microsoft-Antispam-Message-Info: p2nM2iWS43Vg+C+k3rYrZlB5Dke6ItA3nTfMtk0KuS2vGSr+vvBd5DCWSw1IaHaQR4g8lzLe5u28QkXP1ilBuLpObWZmF+DH6keUBei/E7aQshI8Gr7GHYIH5G8U8HlFbrKQRPPsYZ7CasWdewE4dLaZez5AfP8FfU5IuYN9LspUBGX32iSy8Qwci/q2AjFv X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1658; 6:2418tbY5e2xSNrj1b3LugZx9SQd3BToxQRBLhZP2yKWYGpMtsM8Cd3DJEf0jsPxQCUiSc7O0Mbs6KcT9QNlwvWRUWKEY9JSiu3DcP2+luETQJFZvyQSOp23DzEGhNC6oztQiTFAf/1cpuuuc2JpZQxpc/qM1m50sgxQ7GWCNmCC2sd9eftprsIGK5xCIXryzuJyryZOVFAmM09Ww1FIFkSl8y89fTBUTkCpAfazuMu+fhvql8Z8ruCskFCiSKuQ2D2wrmIpiStExuUbn+ZTDcIwTX28QoJvFoJqfXOS+COFFgRnLON0Yqv6VP/TUejmJFm3zaMynxMJerWedj51q7+DUysLxwWXuHmdBNIc7Q0yADnsyuhObmkQ+vB6lAxQrI1Hp7OYKmwzK+ZO756KTH1YNfL8JJ3HMBq7+QmUSIKsWsmYv7+CW9hHDq7qoT8QwkdViye1N7Xukz3Eyb2jNfA==; 5:L1JRTnxV62/0pOrlug50LSrjqyTqzTPRFFw7oXyd+g44IxHB7Hkdz5f/WQZoSEEshth5jLhPjL1U6RkPT+TTmsjLN7h1uezoAcjC5E18fNDQHRe8brq0rQivwoiZRYsLgWk35EwTjU51znPMIrQLm9b378uuYqEC4/a1itOqis0=; 24:3RQhXAfC5Bqc6y0KJaLFgGRbGEqOb6KbF7BxgY9EK0yjyPdggHM34tvXf0ARMMG/Qo47hUS+RctiETkoE8JRXiN57pEq57zqZ/jLgN3ZYrE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1658; 7:2m4fYwgRbKXjdUIiv2wfL+u7y70G7aUmotcG6HJeM5J/u5kl0NwVKvbhoQy+KDvhBA7rwAySyFkc7LfrfST/xuq0EdZWdjRbKdwrESsD1bfIMn9MGYI1rvaFBnA7SGoCHHAo+ZPCbVvgvG2xu+2qVbjAaRfe/2dREJQSQ9FdV+QJMoXPdtBvuXMwEQo+PdoLih9s0lDCsHsKBnGrcwmmADnvevcyOQlYqz/zdwE6mJnwedkt6vFm72oJMEhUtaLX X-MS-Office365-Filtering-Correlation-Id: c4a91986-1dfe-4f53-bb21-08d5a058c925 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:35:52.7708 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c4a91986-1dfe-4f53-bb21-08d5a058c925 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB1658 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180412_023606_885968_1892FE27 X-CRM114-Status: UNSURE ( 8.92 ) 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.0.71 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender 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: 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 c5b8379cd..aa710c69f 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -252,6 +252,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;