From patchwork Tue Jul 3 23:40:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 939023 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="U01N0gph"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="aR4LN9hf"; 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 41L0zX3ZM3z9s3q for ; Wed, 4 Jul 2018 09:42:48 +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=U01N0gphThEAus keI2tqoR72IgewZY4UJMsnXk0+P/S7+FiqIVu9UePKfLQ+GQ5Uo+r65TaOFouXl04q0i9hUIbnEDx mgQwcwHHw8M4hELrrm/xqEptf5e4nPiw4G8KrMJbDaWjxaI74MFXdwhv4VOL1wW5Ed25ALogBWffn qkI37gKWklrLyFne6iwMEoMfIYR7lvE15Nwnbeya8pIzArwFM7QfUUxpokoKadMEqojV+Tpx4LCs4 HZn2qjqgrlNvwytZiJFoxIuZOH9mAK1q4tFlrE9PDiF1bb41PqIHorxYSVok6GVRLV02DHu9uw4CE 7pe/rZqbJxWscIZHHCcQ==; 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 1faUwS-0000bR-TV; Tue, 03 Jul 2018 23:42:40 +0000 Received: from mail-ve1eur01on0623.outbound.protection.outlook.com ([2a01:111:f400:fe1f::623] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1faUvK-00080P-UM for hostap@lists.infradead.org; Tue, 03 Jul 2018 23:41:39 +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=aR4LN9hfH8d8ku8L1bFIb81CQjKzRJEWB46nvxH5T33OjY5XKZ3B5EO2HZXGXK2h/eb1HLS7y6UkkTV0uVerJphEBJ1d45gBdYULtAvI1hN18+9EghzcXjBQVLh1YYS6yAu6rRmAqcO0YHyQc4tWhL8siDJI1YXFSBSRbEUFrTM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:49e5:5650:cd5e:e85c) by DB5PR04MB1655.eurprd04.prod.outlook.com (2a01:111:e400:5995::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.18; Tue, 3 Jul 2018 23:41:03 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v7 03/13] mesh: relocate RSN init function Date: Tue, 3 Jul 2018 16:40:35 -0700 Message-Id: <0b597e158d33d082ca32ec64610d3e89ade241e0.1530660888.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:49e5:5650:cd5e:e85c] X-ClientProxiedBy: CY4PR1101CA0023.namprd11.prod.outlook.com (2603:10b6:910:15::33) To DB5PR04MB1655.eurprd04.prod.outlook.com (2a01:111:e400:5995::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ec820569-a6f4-43a2-0d48-08d5e13e70e5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB5PR04MB1655; X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1655; 3:WDakrtLw7dih/7Go8wNz42QqXp+7Lxo0AsJeq012S3103gpo3IT175Xt4dRbipOkuroU78kB1Iy4hIsmmmLD2fOfdw+Cc/h4JLnfFWCFnC+LJ9QszELI6ndZM8tG91gM+bgv1NbduA1eUu83S0RNNkrAOexNQbjt3WfV4ZLNRzAHweCbh036JXS6z6WHnaFElL6rX/AvLsLBuW8STdssG9L3up7/28K8kCwtc2lkansz8V36ozNQDL9qRlm7u1Ca; 25:oWqpB6Hq3taJXjXk8GT3DpieK0BzIuK5LWZO3P4s04a7KJQbJyS7SCBVlEMIC/HZ5n02sP5ibg7DMbcMQ8eZpiD3RwQeGUGwQPJtHekoHn310h/vYAvJmNbJVWSL2CgU43R+IMZmBvRAYOQXJuX6BYaFvlYUGhnHZ4QGXyPpn0CO6GBP5j/jwuS1KpwwgZ9sTYV+GcO/nytDj2EZxiYsdo4qiiaUHfkgfakpGfFSXGi/V9QxpiaII46CXqovTNuouaYt6VGQs6gtnvMyFcpVlpwF7MCAp++kEcsIKOdcBK0yjcabZJGqsOwAq0llGFJ+sN7qNKWeWr63U9SsGnqY0w==; 31:6ckSJhf17YRFHQM7uzkTaZpnRHG+Jjuy0sdi4gg3JOOq6iN+YMgL9nki5XbOe+ZdlomzrjXnZjUXIi5vsrIEYuCN4yO//yu+iEGPs4y36YXtDf/ixBl1Ms3tWwktBJBQmM9OMQ5vvDy0GfDgK1hipQkO9SSdlHXP6xqpCqd3+UUo6s3a2YNbDKXGr+y4iEwEy+0Bqh2W1CFSLbB9G+CYAOuq8NJQ43tDGa9ZBIB5ink= X-MS-TrafficTypeDiagnostic: DB5PR04MB1655: X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1655; 20:NMbA8XH0YBdVAE3Z8NB8Z0qZ/hs19eI0/GW1Ue/UGIv4UQr2UJ7xHagwoEhtdgj+xb69KsGgcwQ0wJNEoJzzeJdqAcZxR37VjufYSovFwGabSz95VEbtH5JO1EQ++jhj91K6mcPGoTU3jCgnVnfy8dtl1J1P2w+uzj/4NpIti3eSgdfxNTrcCJbHUrhn8K1lZCKarQoRmtBTij+b4d2+jfzXvV8EhEDY10eFtVWz8u6srowsC+duTZHEx477hiLDu3582L3ggFDanJgqWRoeX/4hPggKz42bl+L53bhH35SfOnTGZgBXlHT+xqv943+MFV+gr698SRii46825rdK2r0YPzus4xacOzQh0wNfkITh7g2rF+GyqmeVI93LtpVBLAXN/4PGHdXaOaJ6ogjuU/G/LlSFhYD2wFqabdsBKuY=; 4:h6WpTjjHifiBlGxgGjQYV1o0UNa0whREzXT6TH/6IEofHkUD5sMdCfIvQ1hqdsBPu+VizUM9bF6tjYABwx5RWZHewnTXOIazqEHU8ceJ9lW03wSXxFD7riM6oSWsrW3f64Gb3sEsmFGxKypwCgGBuTHGJcMti7wdUTKXnLM7mUUaW07U7oU48ZI8vS5Ycmj6+RE/zBKoesWJwx7Oi/OYOluJvvj6hHizC153I5q/PXCQaxxcCRXiMoxlyGTWqz/dvQ3ZoFkbDuIkaD+D610aNw== 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)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DB5PR04MB1655; BCL:0; PCL:0; RULEID:; SRVR:DB5PR04MB1655; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39850400004)(396003)(136003)(366004)(376002)(346002)(189003)(199004)(478600001)(36756003)(5660300001)(16810700005)(106356001)(305945005)(7736002)(107886003)(25786009)(4326008)(118296001)(8936002)(105586002)(69596002)(6916009)(6666003)(8676002)(81166006)(2906002)(48376002)(50466002)(316002)(81156014)(53936002)(2361001)(6512007)(9686003)(47776003)(6486002)(16586007)(51416003)(16526019)(2351001)(46003)(52116002)(186003)(386003)(6506007)(68736007)(33896004)(97736004)(86362001)(85782001)(76176011)(53416004)(50226002)(446003)(52396003)(6116002)(486006)(11346002)(2616005)(476003)(3714002)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR04MB1655; 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; DB5PR04MB1655; 23:q3xCDjbEM2kvI/U00O+LkmynTJOV0vg1G1rtc+rY5?= ziaM+WKRY37nYdAWZ1Ha3fax7YVjV+RYU5LhdKG5IGnqMLf0QAhkDALg+/uPQ2MeVhV/VDUdYwShEUTqNLhQCtzoFkcEHzJ2O0dc4Afe6FYBvlhGjeeJw8T3qZShp5lnHxO4X6ssBurBdAEuqPVo3O7zWKz56xi78N4fHluK7e7nvf0H4R5Cid5qx4BRyRTbXx3Qx75bXIZWaRgQRz9hL6PzIcb8Y7FbzAweHCd5hNISZoGqsYHU93LTDcafyFHcQdEu+MZntyUgDUl6e4zcBvWGg13RXx+RflVx54dTapXO6XlLP6i/iHtMAi2HbTYUl0XxEYUWhSlV8Vd0Mlr/AynLfoyESrg7kToOaGmTPN2g4HRZYCBcAoecc2wSlulBxZ2ZnNaU2AomM82YNutY+Gj0Dr+V7Yp+uyNj1O3xFX8j3QT1fLmpceFOaCHKY0irPEUaVyB1jfdvjZ7yaT1J3yHeeKdaANVBIDkUGGjU6mJ0it0xUWkfYNYNMsAx7f+WnoHk0XBLOT+B32XX3aYeCJAoQaqIv+xMfQ8p4rh72NraHRw4d3xklH2td2TmpX29tKhTn2myNMesdUovWTvdnp45F7BxjQBBAo2n3uRzpc/Q1JKi2L0OzpUTU36Ry5h0qYBuX7QwnOWiImfoXu6MVRHaCmu4j7vFzdvKFQ7vf9B9w6SnuagZ1RW7dPcO6HXHzud5lqwgqVDmWU/C39lHadrDWzRxvT+ER2+YtpM7VbS45e2lA6FpFS8+2vs1nmIC5P9o8IvpG9ggtc1tGtvyp5CpUjVTLX7cPaRyk6LKo2TS6XDu6+Mxcla5E/zy4jNKjFMZy+XdvNC0k/bkACl9EPj9lA7tMjjD7zhcFUyHrtR/mA19xzkbqxYMa7iLTACXt11EujMWXysq3XYdmnYcApTNAe6NJiuVjVoD6ibUKC+gpYYhpmRJw0xM3Owl9T+PMR0fkzRKHcXKosfbycIsVwPM8/hXaJIDbU+wD2voasnR3XGacvc+9DiTjY/uON8MB94fNhhPdlsWfzofgW5STmLnhE9FFuERSqZdxuSmFAz4Ir2acZGYTqrsWvwMfDK2h4fCksEAwZRmeVdvphHGro+L/XjcltNeXHqxTKeTqc0yBE7Io4azrVdbu5zzz/WoQfbH7pqIelh+tSYQetnjWeuWoZMi4sf4AeKrSHSOtunLwryJD7wP7HoXvlczaWmH9HywBd2qEykzXWfxuoeqljLdC3uBoC25Hd5aCy2Xh9oeyT1Jui6RdqIwcd/JwYW9VlaN1UmIVUT7lOIfK7q8hzqxu/EC5iKt15EtmlTnRJ575TT+3cQ4Woet3Lt6WxEN04= X-Microsoft-Antispam-Message-Info: 87KkifaMM8YSm85oupnpFarwTMyY5mBFi8SJLJBIb2NSPDtmV7kbU0eqYTdHaEfEPZZ79oMs1xV8coEp1A7FQWefsIcZTZ1KjGZHJwMaiN6BsSl+u2++F5ChraRLnsDlcwLbGFjt+hyClWoiHjcstbkGmsBjKgXRxdcpRw2T10ENRD6AtAAsAHyDD3smlxkfhe0zJ09xhIpAgBeBktpQ/OBTqn59spaeC2Lm5aJrQLu7ljE/eHwD87PodJv+7XVPkK99PYNCn2S4gNbxsgf5b56vhkw7VO5fwuRFN3h5vt3LE929xTgSH4LCgmD1WXPTR8UJXJqtVDWWYNRdAl+NQ/cw48X3TrP4ne2+RZtjuvk= X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1655; 6:ZSUzy+Y+5A4jDbdlPA24vhldwsI71ug9xaIzZDU5WRMk64ZsFk3e6PZzt1+Ye/LHKHDmZRNKaNkuwDtFsUMOtpDayGcQBNiFcegFCWpTcfhxM9VgJ1+6zZGLciRWR4lsrI6eUZDT+tdl25i6yIO1RR9QUsFcz5hWp2pd3UF7qdGvz8AGEHNiIKA8QUFIcHTpf7ygjWTkLdP3ikKuibSf4E9fSOMVEQyRxBBrvlzKfqrWGDDI+EJB1F17fFaybuJsASPE0HIPROAhchL1XKeoIVBE380ghstiVGXRPFnCYJ+G9/lILm76JlY6J3Er7AbcYdI9H9M/Yco2S5MmZxawVEgGOEziHTr32mNlYcNgYT4ZR8aW8Wveazb2qZXvucznhfgGmzss2QryNbDkFT6rsrSV3h+CDzu3QkSXaocNXzxYSxCyzG9iDTEt42zHZ98GPm8GEZc78GrYkDLzkpWpuA==; 5:my6bAchyzBigwvqVu4XVDMgzWek7BgP8SIeQvs9Fl1XVJzWW7g2FESaavpYvvYdhipdvgc4wDBc1Rtbsz0boysPJJsKGig8hla13kVkM1QlQqVtuW2Atvx+VdXjcZ//crixAxRHSPsZaOwrdv03+wKJN3Lys6GRFWeGHIFLf8w8=; 24:HKbJYfZpfm/QLvhWcML0u4cYcr52Cl+Yb3ASMwG/4bLlOnHc4aQe0Ldi9eZFRq2rgoXeRS8beN88y3ef25QsXep7fc1sDTD4xfK1eC8ul+4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1655; 7:4VuQaNve9PjhS6xtKnx/NZnPQLUtni5St5M00krFtti25/vCJGMDmp4DxmHOAfcXZcoDhpAJ8zJT8yDj9RZGfWrOjKoND1Zt/9lptolTzcuX8exiNInTVJTBoshBBIxodTVazJs8dusbSPIm0q2quYZfq5wzEeZ10rSLrTBjmunF9qSuOVO32NDDXZlcvl89FyJrBl1jLkP4bs6MtkJ1NhO6iaIXgXr1gshTG0PqhUfnRSLow19+9e5j71ggWeD2 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2018 23:41:03.5169 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ec820569-a6f4-43a2-0d48-08d5e13e70e5 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR04MB1655 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180703_164131_896807_ED9116CC X-CRM114-Status: GOOD ( 11.41 ) 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:fe1f:0:0:0:623 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_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 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 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;