From patchwork Tue May 29 21:39:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 922422 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="WfH+z5Y8"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="NMwFRNDC"; 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 40wRyR4PVSz9s0W for ; Wed, 30 May 2018 07:42:07 +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=95mhOVfP1BHByOxtO+CJpU4XfKImJu8gq+KvYtNmbDE=; b=WfH+z5Y88nyna1 eel8AwYHrinDKpKvoK+OtOrDEXzYJhPhA4dGdA9Sf/1wLGx5j+mDn4xbPUmIAnOJPtA/Eln8p4K4o hV0xY/P7dfyKzaVpw8BCxBhLtnMOKr7/4fGrHtYeZnttO4RAC4egQraX/3TbzMPZmbPc6b9K9bfyz OD+fxvAhV1d53FI7htUzR4jx/dPuSH0CUmVUQGeQ3Pe8gpXzj2UCJYngCVnr06jIfCE0jHn9brpHm zYKLc3GExSOicTRipWqCF4uzwwZ/6MsmX1p7XWP2mk4gKDrk5bjmpoQI/w/353Zv+ZpirHW2Fn30t LlcrHwi/1ru7WXNgYgRA==; 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 1fNmNS-00076T-Fu; Tue, 29 May 2018 21:41:58 +0000 Received: from mail-db5eur03on0616.outbound.protection.outlook.com ([2a01:111:f400:fe0a::616] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNmLl-0004jj-0Y for hostap@lists.infradead.org; Tue, 29 May 2018 21:40: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=V0sSy30FEjltBtWDULmlIsDxtwDxSepzqVeUuWo0FKI=; b=NMwFRNDCz6OsT2zDpz33r2WzTmdr8e9lmSl7um14cn0vxsz1UXwCpIkmxlAbJfrpqb5Wun8SA2SamFgYp07WJ65zqAa824raKCbo6PgYs1IngeBGQcBWs4jJGAv3IWirop0zQ41D1HJ58R7SPHh2izGsvYYfrns/1jGfN41jAM4= 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 DB5PR04MB1654.eurprd04.prod.outlook.com (2a01:111:e400:5995::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Tue, 29 May 2018 21:39:39 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v5 03/17] mesh: relocate RSN init function Date: Tue, 29 May 2018 14:39:07 -0700 Message-Id: <8b5f04f6d6f90a1dc007a91be9ab4b28e7ca3b15.1527629631.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:bc83:1bef:7e2f:6957] X-ClientProxiedBy: CO1PR15CA0074.namprd15.prod.outlook.com (2603:10b6:101:20::18) To DB5PR04MB1654.eurprd04.prod.outlook.com (2a01:111:e400:5995::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:DB5PR04MB1654; X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1654; 3:YylBjJtPNpV+TZ4r+TgHqrxug/F5b6/xRd1JBLvfqXfD5EF2TxQafVciOtSrKJB11lllWt5cKQCBUg7TJwbdicR2EfPOo47Hd7vbsFTNt++wJfcAohQI+O9rcpYSTMLuF4ns1fTyCgwhqaae7nw7+7Vu25I3536bZmSFxWjT0Sj4LJyq9WLhzpxe90iHgBtWsAaqaN28yO2WmuCyfpQcbUjYHfZtc+MeRfteew/AbksfMMkGlyG0frfqVyUsNZVA; 25:Dw9iz914rmis9YpW8PrBNGJUCrEHAQrqHRzpvQcCifqaSXDyraASr4Ln3+Jfl0tsKTEhKUaMBYHfK82NGxFf2EgZ/zvHoaQ0GpxAm8SMlM0LSznV04mW1T7sZAARHqZga+xmfhs8c5CStg4XvGZtWkMJbOh4AdEGdo68Id+6lfL4mYZQPwAFZnblLa8zS+ViMLOR4uJAqdVOYgUFlEUUajSjfaRa+Dg21FhqNPX4Fo5P4Ww5hLIIWIHc4XQsHiQ8l52R6YPdVEiI2hM37IKZWfMw0hn7DdcSG9+L6Z9nghIrK0toXpcVEWsa11EruvCfGnFZVPBJ1pUDEM1DQnALrQ==; 31:acTLMjKKVerfIwao3AW3R67MyCF2usHFC7ON4AKPemBnzNIUZKzYnhqwnt8p04I+oAdvgt8uwsV3QJW0RSBEY7o5XHXpt6gVAQDxhPe+/eaFCR8lqcJDPZMI/E9JMX+r+A2MVJ0fR4OuBA26I60K4wcya+oILWTaWs50QaM/xbChI/AnsOl7TBHWql3/Zx1fZbrkQgLYFhBa3EfEL1k30jJpn+jTBjAlLMpYhO9rCNY= X-MS-TrafficTypeDiagnostic: DB5PR04MB1654: X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1654; 20:a4sWHndAqqjOdpMgN7BudpaNNu1bKE9uzuphyi4TDhF5ByIA9J6hfgAs3Ma6tXNNkqiUa6WH7+GITYaYyTMFL8tWZ10sqsAxAhbmtrBdJgH1voy8Yc1e/S7SgO2Sy33nxQU9lIrWYYexhOwmfRNXegQa7yMIMRQFxeTeUkyM5uZrfgCG3TpfNCrr62ePkBtfVpdIyzqCdNI8YfOoTtWupkguyjmcNllX519xbVEGbfSaiax6kSQV9msNX1b4PI4sJDTfFGZf6nkLMBv+WaeYU+BmDY5MzVrUiJhcJChL9mIjXiOtgpEn/QLs/B+28F+2RN5L49AlFHr432GF3w6b4jk6L1dQfim5Fazv+WPRmfjpJbxW8sMsMUmjj8F1pcfOO5KQk+NbF6ZYWiSeOG2HuM5G1JnNZZYUmsUqLEYd5lM=; 4:vGHJ3COzvQNcqSrhQk2crzEsQIPx3wkbjrOQlJxAkYmeQft2aOdzEs1n6JsvIm5BLfh8X+6cIOm5F9dwbTIaDXYo6Ve5oa1IXYW0s5Ve9PV+GwTLnZeziNTQzPkDxBeMpV0J3tC+J5fKru8vCB+C9YCDFbjH0Yx9ryPBPQX9vZ8DbI0bfGl/SBNVxROcyVXn4064d89LgsM5f7sv7UawO3dxHSEzFvIDLpXNBsKVjKz5/uMOTsGl1dgtytiZb3S69Bc0BlDjp/vcZIjmjgezNA== 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)(3231254)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(149027)(150027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB5PR04MB1654; BCL:0; PCL:0; RULEID:; SRVR:DB5PR04MB1654; X-Forefront-PRVS: 0687389FB0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39380400002)(366004)(346002)(376002)(39850400004)(189003)(199004)(16586007)(8676002)(53936002)(16810700005)(97736004)(69596002)(25786009)(6666003)(81166006)(6116002)(68736007)(486006)(51416003)(76176011)(52116002)(316002)(85782001)(81156014)(47776003)(105586002)(305945005)(7736002)(478600001)(53416004)(86362001)(50226002)(52396003)(8936002)(36756003)(33896004)(50466002)(118296001)(46003)(386003)(6486002)(6506007)(106356001)(5660300001)(2351001)(48376002)(107886003)(11346002)(6916009)(2616005)(476003)(2361001)(2906002)(4326008)(446003)(16526019)(186003)(9686003)(6512007)(3714002)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR04MB1654; H:smtp.office365.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB5PR04MB1654; 23:CTNyFHDGbXxvvoJHa+LNQSqrD5updEVkEzu6jFo6p?= KzogqH9ZkNTk+4gvCV+zQxxaI7Kg2Kw5wDH7A7/5XtJJDhBvUuUKR3xN3uzzgJd5HlHCJPr0ZINO858lSGPMs+meWzeBk8SbdNEuV+FDyX2zKwzGyvPEsOyF+vz7l3S8ueFWuo6jlnDEm29wuLgLIt6ud5G72p8rxCH2kXHVA5CZf1oaxSA1WVO/SlWoy3w3VYLHSqaHB5MscC3/UrmCffO0Rmpwrdsi0Cf59/IO19peQDB4qG7yvQsP8Q0Hp/4Mg1pqeKnngCS5NRYAGi7CVue75pGh6jYxVD2O4l6oaGJHQNNMQ2T70d/aETjVWTK3UvaLFrSTevz+b5/jNQ4S49JovQPr+L3/HIqWwuvIfLQtdS9roazyfQkBx6vFv0mxNH+Ma5GeWCKQaBEV2A2vCHXFh89j4U19rTy+SBx6qbhL7vFmejxIcatT6s8NO9Om51szb5ZajE6O/ibOee6l8gG0gW/cGMWGR/6VeEP8oxfqdksSRH5jmFWscZG3OmLv+uPWZK1LcUjP1NlsbHVGFqaDrjUrWcFjpb6UTqkc0el5Rj+JjzMK/qf7aUlvATSafq8usle8qOugE1Z5l5X8eH0/LrXIYDaFfDqF0J2Ha8iZnFElCJQHY5Yo8ubAbqxqffJXFKf8cQXKwRUout+UYzhae4/B3JTjFzOsOABzs36lIjb2eCd8qASMa9EG0CLYHbSvpVA3Tl+IQAwwwG3uacmX6X+t+GSoqSytSCePT82zZS+8orLyt2BuNUP5WFPDYf1Snkp2wuQEOofFK+odX9BJkxCOhOpmtPMEGCJkeOtUzvKrRu8U+yU3DjtZuRu5RsVw5nQFuOVG1c1UQRShvemEikTkXgxtwDZq+XpKWuj3XKuFDHOeFQj6nYY+TuPTKDO4uzP7ukxUl01keTNgSbyOjzEYFsvqBaAWbnx3fZLp2uZCUu4cRW+jyPjm437JfYjLq23+0P9QEU72EJI8xV06PTZo9Z2mpEv9NEkQcBwQdmscGdKfnasp5h5cfcjwpza+yzri2TWSWwUtzkMpmQVHInNT1Vw3eKaf/KWwWVvS81uxWOQ30sHp5WaRgpbbibxE8uLCuPQppR7IxDx/tCRKi7rH4fUv2Z7ijxa5MsmZPV8si7NCnCkiLvvNsKNEF4+xydHgKH9D+JbUidu2bFtmkqpxcp5CFazYsmhn1R5BG6WSJx4QDxjRU9p8lOI62f+cwwSTA3VY2nsW7dH1NMNVwAQfFiV95z2swEC3DCeB5JSiBj3W6KU6i1B4+1Ekq1aZsxGEQ/qczWRc7zNsKUfJAyfzdzpYchxstQoLv++O9ipaMrvSC6P793//b8kOsoV9u+Imp/9jSiXCmeiQzqq X-Microsoft-Antispam-Message-Info: bFGurvbS3Tk+vI61UxPDuwIJEwlZGn7ZjA+IAuny7b85JerAtONq7UShSP7SUaNASrBo2iKoMNjVzJrCfiPtVvuU5+m6bVUcUpbWaeFOlcYQr7HTx8CWYm1ydnKpijyenQV79asax0L6WKuWT4m6lH5T40XVgFlwiE3LbVgWMMm0ylPkt5tvok0VBbmxL1XC X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1654; 6:To0yC1xe+jZ1V9yJ+N/ocYXyHC+QZHJv35Q7ewNv9tzJFpJL7iGL13CfdBfshZ7DOE9LRHvWr/fgQoUrR5TJ1Ls8IZfdqFpm6dPLkay/X+iweOn2D0IoU5xkNqCEdOudHL79WMOwoAX0yALAUJ20LkawdbTD4KrqMEGCCFkY5/dCRbHEAWYgEEHY/Uxe+WgxFDjxIU4n8ugaq4UdeqAzp3ReNuQfBHPryTnIL3XN0nocV+vh62LI/cyMlYJO8wp5KZlWG1d29X4HZw3JUpZdf5enHjYc0FPQodbh2FxxK0T4z4HNy+Np60xMj5jqDwpCqpzFC08D32RFHRO8lEMF7ivMoIfpiM42gqaDVC48/57S9NLHED+bIfDLvGAILujaeKI11HULVkogdStfq/ErqEO6AZC2eglFwKLBgfoEOw96wo3eWUqXJPudwi/r0ywMiAU68BN5/gocivQYq5JlXA==; 5:DB0GuYQC+WQx7ebVu/nGA9iarudVWu9XM6KHuHgsffpBFdu1HbLRv7LjAh9E4be2Y6L+hsLd3hh3HPZW0eJFW/KeMuFDORl53OF5hFNNUdCmk4hcpC8q0tkUr/o0kOBAbpn46NB7ZQkOm91Z7zFg6WtS9/QD1AwXIZZ5qZS+VVs=; 24:BfMk0/ir+DyxJ/7McPKD9uhQBT6xMbENvQGp2YeoNQx187gHr7/bzr0T6mM8RRDoMMKGebl5jn7u/BqILSPLc8m9V+onyt2AmkyK5jVn4S0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1654; 7:blYdoNAXK7NwXpEZGgXpAJH+Wo7GFia1EeqDPJUuiBnZUzIo4G+lu8ISvV0P7mxp9/7nhD9EZnWBEUIAhYSiAURkI62e6z/uJM0UAdGgnySqX/BmIS6xFXCv6xLU1AyhXjnRS2nxxyo0q0T6SyvrvdAYlyvO5OdRYs7BCLKjb+Efy3j1/zapq13sJOkpnntu3AEejqgyVLEjLvH6/sTiqVQkTf7jgeQYy5oWVfVmwaVjJVGR4E08Xqn7E6j6/VuI X-MS-Office365-Filtering-Correlation-Id: 88be9388-f013-4c90-bdb5-08d5c5acaec4 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2018 21:39:39.3473 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88be9388-f013-4c90-bdb5-08d5c5acaec4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR04MB1654 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180529_144013_240147_7D08ED53 X-CRM114-Status: GOOD ( 11.73 ) 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:fe0a:0:0:0:616 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 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 9e46501..6a88149 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -336,9 +336,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; @@ -384,6 +381,12 @@ void wpas_join_mesh(struct wpa_supplicant *wpa_s) 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;