From patchwork Mon Aug 27 21:28:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962646 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="WwdnvxFA"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="ZyU4KEUB"; 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 41zlRT6ZtHz9s4V for ; Tue, 28 Aug 2018 07:30:29 +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=hhK64FpNBDkOCics8KkWtO+JiOLl8chtes6/f/C4Gqo=; b=WwdnvxFAFWxWqv O1WMDTbs2yNuD7CzVkAVyvDNM/jqaCO7g1fuGyFiMhwq0/vbQAvaXYppVn4PG7kTnD3YjPa5dW+0K olFe78wawogItLJBSTHgFWizIsnIcWYXEB0E3qBsWjlQNE5aPcRvDaETFvGvZhflx9kEBsJ0y/XoD 1ZGQFFZPxP5qPO8RmNqff880F1AlxgX7oWR0giYH1jFxnBFTNckQtN7Tg8PDkxjnf8qOoCqJyZUH2 RD+6NXIXyaTF/MQ2JuQ/HCJ07OUGwoXhsF/S64b24p5E9gvm+kZ1SDS7aWIBoE44eTh32CE5fEBcq BPHWz64v0PCnm25T6iUg==; 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 1fuP5T-0007Ly-2B; Mon, 27 Aug 2018 21:30:15 +0000 Received: from mail-db3eur04on0603.outbound.protection.outlook.com ([2a01:111:f400:fe0c::603] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4b-0006Qn-31 for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:22 +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=ExYmbPHDBSFFQNG8Zc6PrBaTPF4W23T3vLZsIm0p0BI=; b=ZyU4KEUB7Z2aEdrm2b+lWX953RvJH8K1KjJy3blntU2b8C3vgMgPGPhxzkM0Ge+HGiCdQp+85rH/I5RZjEIYPMPG0VGO/HrLnj5sjTKqjh/2c+xNwQpgaVfc1d0gADMEYsfxKHS6HsttzX30Bzb2aTydqXh8fRrZMWKWrdIfbwA= 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:04 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 04/16] mesh: relocate RSN init function Date: Mon, 27 Aug 2018 14:28:37 -0700 Message-Id: <8cc17ddb599a3d2d457d53255cbd392be3fd95c8.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: f98ccc03-6bcb-40a9-e996-08d60c641da6 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:7+K/SXdfqEs0I9H5E0Wuu2fUGgrOxUgzFCEO9olAmdC2XmGdIyXtq/ze8sYYyGj2qOGvEPHFS2rE6LQRfX0pMabXP8qWTG7V2up6h8JsqK728Oyt+87UhbBE1DhEIYTChZGHekbdvN8+YmD88FHgMY2qiGDLmjJ4tQonHqA85CU8XZWGf1m7njGwcQCnSzdXGSeoFn4nn3YFIbkq42KHE2DvVGWtI0N89+Mvy5+NXEzzbzfsf5qGmmoj7LpVOncq; 25:hvmGltP4dFoxdSkYExT0vlw8nyVUrWFpLnQ9zKN2E8bzM4ZsMVdz3FSm8mnOTuwwy8vU54zk/zI8sGXQspyVGHjyeRAaB7jQ4bN+fVe5rmDw/qQLmrawf56J8/7OvN/3xuC2WjE71hWS4fCmWwuSvr/sCEoT+asb+WE9NXrQ5UOV3LJKhIwRq5Kn7E8djPNWvPc0nLLvB5yJkxf3u8FcRYDlWe4nYwD0XN9e+D9zDq4E6tnZRhtp8NhPzTCLSbmxmgzFF4B+rHmCTO3huMYkj/V34xlWr8P3wgCMRaYMcPLuedaIx+PVFd9smkT5P6xbM1rhWkEX8JsiubFCox2WNw==; 31:6JRUQv+FbVpjn5oUIiceKQVN4SyHEVsftnmiUigOOH6cnw0Z5ZPoIih3UShPvIn/tbbQT8UXfxmJLdNvf7rdBlrFdJJRharHq3b7441NfkTlQUwxNuuzlS9MQI6BmxjXXT2avyM8udM40y1JYO3lQBL3OJhjeGJFPAFXyulIMOzo+Lx2aD4UBvCXDWFFmiuSLSb6rJEaM8OWRbCwnDojhYVAAmHMjXTsXUG9np2AySs= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:j81Zy5bXDCgv+AFpc1RBUSV/5gu0cggxv9bvzv0nomxe0m2l1NFIiP27V3f8aYn9SfxUHM+L9Z+00voKP4QwYx54oObxMaDPaxTv9RuhSQeDO3AOPxxwpBmuJRWL7GVNXAHSbItk3lv8t6I4oInIBBezaGYReeoyi51/eMk1dSAqhSmg3QrcMnyqVaUzL9H75QDLug3kwQ+vkYRHQ6FgEmWubjZ5MVSDMKi5Se3mGPrqXrhQaMPDHD2O/C4F1Swmy3Nw+uc3wLd5C6Sxzq0YBAOQ2NoAZQSg77IbFgn4mMfAYFnUpBCD2piEFq9gkKQdqRhBciiV2tmKhT9xVdROvbSMXNA9u2oKulQ3t2RiKiDgdXsggJK94nxa7CA3nwQH4xw+mN2Ktm/71yVeYzLSzBwcQK5ixLLyctfGEN0AiwzIaDpzD4z3SdaIA5xI7HxIR37hZHntJz1vFDCTjXMkjQZwtttqjQdDOPYzWI1XAYhIkJJXJa5PzYTLn4QkD/Yg; 4:XDm5eJB5+OulbqFXueFB4pZUm6LkS6ZH+M5Iq0p4vXSIaicOx/r/znY6zLWdpUr6/sUQDXx4XbgnNuadbihFxLICHXqHS67UQLvPWSKh6TcseI9HlHkn7bkoWzXu3x7YsKSI+r5wbyZxfjkxXMu0O770xtrDeU/bcQb1K0gVbx8N7txzmwCHeKAwwTEImrmtX95/judnBXz7v6p+wCWzfGm8+N1o1T5JnSMvQWYoYu24zO7H3uQb5xxj6I6P1IsjAPbFseGyUiUaRqy4F5j0bg== 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)(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)(3714002)(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:INtYv5mW3Ka8Nteq9XkBNpG26JT8ARkrRBe8LmWB3?= J5nAWAvhdkKXPm4oUmOKRPs590/rLnb5wTjNSiJ1ODsR6OLdRpIq4elkk9BPstLKwrkR0fQaoOac+eIkRiONlb6yXl9UjZC/i0yAJTyvG1wqDmksvdc1JIzCBQIk+Jk9Kn12xrZHKafNknghL70CArH3m184Htbz4obUxfc3KpnQoP2bDmfWPB5dQu0avQG78bTuVfI0LK5ZTzL8qgDYmiIh1vPctWqHVtcEx7q+cqxOh3qWv4ESRAcckOtvJkz2MfIWvoOUsfEvIDkhBW+6T24ZD8gvj0R5Fj4cGbHnp4Q1qr4Jw5tI9EVZkcUlq7Usl89pIO1C4jsHlXewjUWAD3L2DSLhg2I6YNXi6tdkWNC3qL3bhClA08KgMFyQCAPo484KVf050jT6Fve0Ut2BjbCAfqMvIOqJeXdaCc8J6LDI2UPlAoVyayH78KxEoWR65xJNl9Odv4rUs08C8UNvfwXlpy3+iR5t9/VMM982LAp7e2vVxYK+fO7N08zeVm2CUEfo/Iv7j7rYEiUZH7dfizm8YA06aSzbcxz9+8fYn/E/SLWusD6/VlmsDnTfTW/u8vPxuoc9zbZQnm+PfJLGSHVhpJBH1fSkrimtFtwP3V5ZxEtfa3lKExS4EbhNv9ePWLJnB7D8AhRfAXS74QeSRuXuxUxeFIanxxyTIue8Ks0DyE/ii6E01xicjCLcnbszrEzyxWfZAolrGP0MSuE9TJSP9taqlh4C/BwkJNHSdWDYYFED2XQR4DXlfubzXFCtbM4KxSN6xWkJvXzec1kyqJCBrhY1yZjlquxdtyu/LgcGx7YXXaS3P7dJsJflx4fR8Z0bg34PaR7eoogMvrHx+ggMc7Qy5pPzJFbbFgnp4dELWJDTk/YX9mTvi+LN5YA5zN0lBndum0l4mLDaPnG/Kxz3stjOh/G8ErvOaTIm+8zf6VO5KPEDXtwi5sV4EG4siHT5wY+c5KXI2zB2APHv9shlM+xLn0ER7HoCFFRfjSlXMURdQXgDSe6s7zblsQFAcT+4BjLkmke9+6k4wZXKawHntcRVgNLvn+NLiMzr0tcW3xdGLlxYA9HJxipU0WCcl7Bjx55C8p1LE6M5DFt/z7gL4Kv6FubyJcJbvixXiqfqD+zviDpQ/V1zBqtNGOR4lv1FrS7WQJgaupn/DA92EtiTcQg3l9RwYmVMgwU7lmIPseYNOB4T9GEP6kDQYo5frTV7aBNDAM0rJFCtMrylPDtvyw2gGzQblQNijVSod07j2k5gwhkyGVm0TyV8Fcqdg8IqossQpAXn2wtmmwkILMNe4fJadNcFc+MIFt6mieF7P1DVinwm/j921eC3jrcM9w= X-Microsoft-Antispam-Message-Info: x4uKJkj3z9ydlE/qLd2BHYJKA6NEVnj3zZRI5zFDrV8I97w8SywxlOvM6ORcoLEwPcOezTRzPp9zYwBxKnVjXFLrgvN1lLrTuX4ceEVNW3hlB4d/+chI/8yaOXHtA9BbqlDzy8V5w0QFwhSAWcW0A1yfKqwKFbh2Yf+tvUtXNmG/ZH1SoKakEQwKfKsx4weZ+M0ujy4Rzhy8oaopzhDx1NdKp32dZxMiDphuqNhArN7yVQx3mionq2B+tk3e1pnOFz2OgGi8B8I61lVfpuArWqpaq0nhnNLYrSikADBkEhmOdQlmm8SRAKwC6ByNaIYwgIrI8xJAO+qJfN0aGjiMZ/wKiA/r3J0eV//UYnLprtY= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:JPsk2rZ9+kFHFpt3mqYuezfDbuucEbq3r4uSb/pf7LfBiPICV3sJQeQUBy2o/HqiMC/KmEB3NSn1MfX+zxVzdb36p65FEKK18SSG8H4LTxEXkKz59CogKoacxryIyRoveRV3tmaBPxM94U/8ctQWUAiuVVedbniDViHfTO/DQHiqEm7RSgU6r3O0OwVWH/WxA2BV6r4JOeAR1Do3UNozfQoYLESdyrBsnorq+VbpWrpfoLy2NZzCtmNVtcnLSsa5RLvoZkai0v2BPc1jH1/Yye3oVfGTOvZHcld31ngcoYCn1bSkY40cmtG+xo/yNTeWgNmghDajshG46iMB+x0GTMgLBCSBTl4w3yS+IFPmDl15fxnoZuy4/qaaYtriC6IB/pQejqItw7Ksyd+wQLrYY9QxG4FZjDEFbvTLOS7/YLcYjB9k7RjORQIhdT++Y/oSxOZc7eDZlxUZNo6sooF7qw==; 5:6BghQKzTkn5BFJT9JjGciwAzyVuWO76DHekUC4cAqydcTdR1x8hCmdq98VYcxeG5AyaTKAARkiRsFfidWljoT/hOnjd/CXU/IZwD3ImT8LoTKZ9Tn1JBHwHikabFtrJnfitap18FxbUF+miWPk4+9L2PQRZMDyfLYIlyHKZ06lU=; 7:W3rjXaGXiNtbQIZvz+qwmceTXQRasXSQkUUix/UuDbv+uKSOMyMKlhHyRIpS5U1wAP35tGuOzO6oO6HcN5Y6r06YvEGt/Jr9sFf+gV+pxR0ndx/82KcxM88c8E1Y6UXUTH7FndPrbRmMRkvKZFQm8nPioSfCAaXyFPaqbyClXorS7gG7PlpVohCXJNkZd2cjII5U4ko9XF32QxEIYi1Uy9pBBXb2AH1FcsftIOBJuH7dndX6sEZC32TtVxZaL7Sx SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:04.6600 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f98ccc03-6bcb-40a9-e996-08d60c641da6 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_142921_152438_4A8F4084 X-CRM114-Status: GOOD ( 10.61 ) 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:fe0c:0:0:0:603 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 RSN init function should work together with mesh join when it's used. Since mesh join could be called at different stage if DFS channel is used, relocate the function to mesh join. It is still the same call flows of mesh join before this changes if non-DFS channels are used, hence no side effect will occur. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index d126087..0740dc7 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -203,6 +203,12 @@ static void wpas_mesh_complete_cb(void *ctx) struct wpa_ssid *ssid = wpa_s->current_ssid; int ret = 0; + if (wpas_mesh_init_rsn(wpa_s)) { + wpa_printf(MSG_ERROR, "Init RSN failed. Deinit mesh..."); + wpa_supplicant_mesh_deinit(wpa_s); + return; + } + if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) { wpa_s->pairwise_cipher = wpa_s->mesh_rsn->pairwise_cipher; wpa_s->group_cipher = wpa_s->mesh_rsn->group_cipher; @@ -373,9 +379,6 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, return -1; } - if (wpas_mesh_init_rsn(wpa_s)) - goto out_free; - wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); return 0;