From patchwork Mon Aug 27 21:28:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962649 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="DfNUMVTk"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="p/iVXEjW"; 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 41zlT35Bfmz9s1c for ; Tue, 28 Aug 2018 07:31:51 +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=R5/40LTVwoducc3nJYyTIeAxYqApqMQOJVeqZSo6Hlk=; b=DfNUMVTk1lnAjr cuhP4WN2++JknUaT3Bv/n35vgR/xUpAefrclbGXy1RGBpR0O/zA+BTD4DBzGEFxmChV6KPgwJjPVb CYkjLfD2YE5W1j7Lc4sXb7osvEsXrrOCmGnGfCqXbFRi3hWDk6Trj83Xqu20HMJyZU956ugYGcIAx FkK/SQI73+SyDoxzJ5TWu0VyCJ3JQRg+YAcr3K7cezlTNw7zB+ZXBeUpnvDK36pkMTkBY1cWLn5rA bl4UFu+lVc8S+7DRWet1PLYda59slSlQD3YT9MYLxc1KiGZIqjoaxtJ2G5h8JbSwxYEed3RuDGYTC 2GEfUgSJq2uFBlCgvTEA==; 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 1fuP6f-0000G2-6u; Mon, 27 Aug 2018 21:31:29 +0000 Received: from mail-eopbgr50084.outbound.protection.outlook.com ([40.107.5.84] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4e-0006Rg-M8 for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:26 +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=Q4OMwvO+bOoxCVPT7kCyWP4swXpJtdLWcgZMAhZY6I4=; b=p/iVXEjWGAWft835MMWRp1ctomb4HBWcknat0+vFUdaOX7/rdr0Fhr5kjJUatvET3+QAZ7veheA9o77WpMamV1gCvPIRVQ918hBdaLSNpdRTmocDT/yq5CvliXIEA6QHJp1/ydHgdcHWBrWH6/Lqw0j9bL5SE+NlVhk+yky/jic= 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:06 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 06/16] mesh: reflect country setting to mesh configuration Date: Mon, 27 Aug 2018 14:28:39 -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: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: ece2cd2d-d3f7-4f59-342a-08d60c641f03 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:x0eFIgbvRRfHAR7V/LSBn2iSGTvaBIGxyWRj8q8hpR5rLZTVOPQkwwaJtRArVq2e1OAvKUw5px5DGWfTUCRlFE0T6Lakdvbf/SeElgzOzdqPhvTNvo06T3rFozOzcUo0p8xwISfJbtUyD5uCns+qMIh2iWxUVfcvMTXoe+eEFWimIDERbOEc0XCb5GN1MBEVwc+sRIfvoinmWse9jWTDJe8Sa9Nme/d+/4spBHMoaoIhfbBfwtptmnpStpI6sgYc; 25:uD+GpV+2CZbjuOPs+UTwbBYiB7UPja6CMlcxnTgVM1iLpR1Zu06NdRPW0Do1VECFgWmNBQBa7h6Vk1zOxtiIz8PzmVc0146Pz+SfRAk65/YPtDylDRX1BswsGjsU6AGKdhNipZA/kCzNfYrfX1wplJ4b/DobwYAo+7jTHxfw0p8jFxHLa/aUvg0fWrq6PT1zJJNBNGETde0MQIEEqo1GEmPeX+Y1TwQTjG7zvqvBb635pszn/du1uXYTNzybysmE6A5UQwvakspOxVTs6NmpJjMVkEaI/dgQSjCBoX46kWaLLukcd2+8fBsDrgik0qrkjZxMDBkrTMUroJ/A5ms+lw==; 31:mPvZ6SC28PeE6Zi3EDi3PE8/8Ti8d6zprSXrKAgfrFJ+sZVfHLJ9vSIS7aK0hJWzZ1uaXS2j3I47uSJfD+x3xCpGSuwGqIXFcGLg0nLP2nl+v/cdNxujYdgwIfffgiMWMRsS0PQiKPFJd7pev8cn2QeUCucldauD/n6EQXLPiBit+TjRA2k5popI7inrMTAHbPo8I24HBtdYS4XLMCtCx0Ta0WYneTrQrSp9W/tWPkU= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:t3LrONQJ5nOcdR/WfXB9mpH4+7RsvmVQJWBoXj9zZRSrWMZRUTo1t7XoboKQEnqvz3GQFhApGHtPZqFqqQ3fgEbmsR5Viu6HpRKtxyEDt6v2SGoGV6Fy4uVFPm9ZEf0bTFOHgTjr/4iL75Zk6VyiDunfGTJH8qbhNvz0TWDXLR3moMLwVYaRTZ3ETQDg+aJP23qwPcZ2vaapIvFbaFhz1UJKZ+UgV5xTXDEYMAs7uV2SEL1xWuuLhxEtaHc9iOPXqtnmN2QIz5cIfJIjqp3RhVJdseUMRMb7Sbuu340VBIMXPPI0fHY+KoJnGe3s2oX5kl+PizuSFGW4U/Ww2OVBTlesdOqe07AEbe8mpkQ1pdepTqSrAyhrhU7laeSBczlVxAtymeiQk28UTNYTOERsQfJuat8Y9SS6x+x7Vv3w/KsfdO65BjlMUg0bHbbv3rvBzch3XHteidFZV7ddWV1MwfhIm7II/sU4rDBSPA6p2OIgoWwMnyCWr6BSIu789vIP; 4:mIug7Dyf3BwarYEsfP76Y5LqTGi8/dRyN3e20umn3kqrfT2VqO84Sx40iQh9SjPrBXv6kDmE0QB9piqksQVmtht8C41lfdTuHu5HGTvaQ7c5Ji7/T2uhw8gVUJmpEkZPlytyo8OW9oqovGG/4+xKullB5UHliRSqACXKgLF/eoW5Ts1AphqDANthKzcgXXpysYBHYDjxb5MvPdszp7/gcxKoiiP2FlNC9rpAa7LeQXGU6ej2yJKK9DcvITleqVXls2YTbI7aHM7GiMrzrFBxTA== 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)(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)(107886003)(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:wdAq1W0cALpLlvy6g1LtmVejVdqGW1tDf3RkfLxoE?= pQL7hHfKbzi1PVON7E5UF1mbJ6GRvc3upt/+Rc0kp0Ffdl8ZINoGn7GDv4c1nZrKSQoWHRvMTbyCOqbb2a2rGQ4Q5ooar9STnXlb6lurqh2PdV8RFd2VxXFgBGu1EOQLpz6nCroH87UeHvtVh4YhCR7VziBQ7lBccBPGmftVVbPn48WrpWAzqLTd8h8by/sAwJAy9lnbSEJi1Xl4WTWCtffoZrBcf4XCOyYYl7T119UCNagV17Iq1a+sZyC8o1LG9BcXai3uJ6IjuW7I1ijMZ/Ak8zPlQKKt/daWt3pzn6GLYBKI2s6lbntSqWomQdd2XAZTfflRJ9UtzciuQbTVsJyjrIWODzlrNI+4HN670i/zoW9A1RnmQi+2F89EIrUyAasoOG5xD6+EWVgGvWUmsVAD3582K9glfvX0iXLWN6A5tYq4Pa1LRfFwCNTBak3xvjd6nH6nqdV7kQ0Dlrbg1I32U6zfUBcYwV86D7hPn33D0lSGRXXfWD5r+u6TGeDlLbp+iSc3Bbc7k9C0XCS7OwbSaSvqljW1uCNl1oa95YYrxr1862xLMWYTQ7ZpmEDl4a8NYRyjOCpSzsZibZOElsN/oT+af9nirNzd58waemXxLLPDKIAWojLcxErOlX5+R6yaAhPVUAnc9kMw2STevpsQoBhJpaC94tTtIQP6AKVLZO+GGz+am34CgRz9HPA+Kp0wXGNGtTrAnO9WLdwZxszHU683lXEVrgqu/7xo/Z2j7XPUz2tPVmIlrEVd081tjgTRnCoyzBnomadYhgYzHgc372qgJWQ/AZn8azzIQrvhT4BoTcwcpSnKfDcKWlgmozMUoYatLijUMG1pmK5LOoMRKhQOkQE2zjiZwXORFyGaHpkErnERxJw1dF/ykVQER2C3AgZOdTlBvEPBEKJ4qOnnT2bFoJy4f984Bt/uL1iKsoTrKav6YW6Mp6GaPy6R46w/JdWVTFAtgtbiKpYNMrcpPGh0hzgH+LzMSCE5bRdC3wkqu4dqbjWJQIZXyEAnS7+7c9bM8ufSgx/W6wW2OVvmNvu0zpxtYB8HweIUk+QrXorywJTCP489HVU33mvu+xdvgtCJA57eY55Oy5JBsbQwAEVOf3mCIT0f6YSHwGFMZ0QW7WNb6n9g1fVrP7DqarFT3Y0pj9D2yQ2k0ut5Rgunwsq+bKHmwlfWecSHUj8NBedZO1LRfpe1UfIFc6jElFzd0uUz+yWd36pI0AFuuSQUZRpdFYjq4RjEOQ9nXa8WdepeqztYeaIeh4F5lWse8IUIbN4D8gVV3Zd8jMDm5bjKUw3fM5C52/i/Jyo3H0v9Pd7MjJNIdDxvG9hgSr+1qk= X-Microsoft-Antispam-Message-Info: YH6VOUJNU6kKjlHGY+rI1FPNKwNHWSn9/7cjd9gi9bPcOUuaRAQB2AiPh8FPkfyt0/IJ7I+6EA1svpJ/9q+vHb6eetqdHaZvJOrjGcyKHkfLkLkA5PAozSOmUWH65zg4w+jTp1T6539w9pnloHVVM7jypp+M13GexTqAssJVGduVy0iTi8qkSWqqZ/fGiuqfwQl3eADEQF7rd47YElQd0dfgUzVkmQ/I1o1Q1fcpuIctWRLEmDZqD1IRP2cB5Dhnq++IY7nLP1/GGv0vtv6JjFpUImIzI+GD6FbxsFK+/b3pZHdOPgQkGjgi1EDJV53BMhWZdheIxBnHokheCkb7nZ4xxIOYHzhYPlK1S6Pd8VI= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:aqza6DziXT0F2wwWF8FIxjrYR4eyPdv2y6tvuHcA1e2O5IBQ4qX+SJsjdixcguBR7QoL+cfeiauM8l9RMisahYxRyVfi8W3NG/l2Adi6WpDGhAmDkyqdwsn6i2nYilrVlFErtc8LZundL0uoovhOZ90J7Zi6hw+atlY3093CJ1mwRgtxP6awKhzmupNZvZx05932rTXdVF0cv1RBBWa596cBRYkyn7P3BQYppa2k1P+p2tzKX6mm67eXkf32NMfcXYq+600YUCFSZW/AcNmC7tBM6+DBglbVVYnHXrsoP2PvoATHreCcvsciy/sMc7MrTHA7mFLA0dSluaJaTcIFZX+dLbzUJ3u/vZ9cqnhg5zZWNwwqZBKM/g7deQPgMsS3zJGdJy+tj82Eq2VSucIAFz+D8gM8KSZijXXTsDP8PEOfe5a7MjWGPl8xAj5Ia2pErCmx9xtIMo1FS/PEUr6ayw==; 5:ds0ktXppAVH1Il/1Snaak0Df3oZhH2av5VJR3ZVRGdEw5359TnpYKoEYRpiMWVvEfBfYangEXT2bKUzyhUuaCyhwB5pgwUQM6BuVQ9qiaKdjBxZCNhu7SPgHrBehHWGEBYLt8+RXetjaXGkiAUZ8OC5UMBvN5TkaHJtArSDaiZM=; 7:BKRt4ozGOqcdsvHOIz4CQvq4EtNmR/SQR0lADG2M/+MQWf2zvMVJ6mu4KVsKAlXMuxKmiCiWb6wXWyDG485K1L0LC1h/VWrPj3evp6dzmCK0xYfXB+2yAF6Tx5H2hJhkqME27O0R6uj+r1FxecelyTay7lsMmJFwCnE4ajPpcFTiwQxGH7wNPXFyKb1OsFYWR+9z9g5ePNA/m2aURum0iN+WYB9wL5XUr4iwRNKu2v2OkH+l4btehBqXsyYQca8h SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:06.9475 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ece2cd2d-d3f7-4f59-342a-08d60c641f03 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_142924_770584_29778000 X-CRM114-Status: UNSURE ( 8.01 ) 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.84 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: 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 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 7b014b7..fe60589 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -298,6 +298,15 @@ 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->hw.modes, + wpa_s->hw.num_modes) && 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;