From patchwork Wed Apr 18 04:55:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 899885 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="r8FKCR6t"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="soUWmaYH"; 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 40QqZt5p7kz9rxp for ; Wed, 18 Apr 2018 14:56:18 +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=dMNsMMWIIg5GUUiwoze1inqoWMan197kO+UB8GV0NzI=; b=r8FKCR6trKCeWB l+NP1iLsI1ppOfnnOj5AQB5YUqvh25nDtQUWKbpdkj4hKoz82ldCv05ko+ZAhQKjX7d/K7l81JCdD X0d5nWmzE+iYtJPrlccFNvCOz8ZFXxsALJw/u197XdMV6P1eD/n8h4zGK4Vb9zJM1Q5enYpnG2f3o WgBt/NRe6Fc+UHNgp5+xPfbEg58dqbB6WsCTaX+R1GL8N8NHTM0b/5v65iYUgGTbb5QulUtg819+5 CG37FAebDWvlBg6CSCgpyOTNAivHeVMpUkxnBI++BZhh69Rj5yShFERPnZmB0jJ9FqGKphqUFnWDZ HfADOUubFN31QOqld6+Q==; 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 1f8f8c-0003HI-67; Wed, 18 Apr 2018 04:56:10 +0000 Received: from mail-he1eur01on0078.outbound.protection.outlook.com ([104.47.0.78] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8F-00035w-7Q for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:55:48 +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=foJpu84D4tDP5/V8oELoQB4MBKgzBEB+mMb3/auGNP4=; b=soUWmaYH+Wj0MoprudC7N8U7NEz2lhbiKewBwCkK1+mnhzwS7LZ6br+pDw3t5LTwKWpU+Cp4RQgtATVOhFdW84GPccbsR0Mg2m+ukgCRBS9svPCDHe2UmH0SfxEJJwWgfR7PRk8YVWNzF0hu2z/b2OjD6e9LGWTXloVMUmWnif0= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:29 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 03/15] mesh: relocate RSN init function Date: Tue, 17 Apr 2018 21:55:00 -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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:czZeuIecSIZp7FPWD7gsZGcxs8QLczPfaeVpYjLFnNHNymnB0CrAtbQieKt54AOBoJuFNVnfA59jiAHlmExsAStyP3fcsa+LBRNjfK7tn6QIgcb548DENh3qyg5wOVq4zdOAkTLOMOYj8uscH9bgp9f2DzKc03xCbKbHQjDBtG5eOynWWuuAy2LBqG50rHwc3XWAUW4UN8Jf4lYB6cFplV0OEgEv7TnBzAy7CrYBH476XR4vAHxnbFp6NBqER+rV; 25:ncOIF1UWHUdx9JVbSiJHZKYboOARXqOOpiy6HGiNd+XnB1HoEjKxKJmatEtuxS5+LfmeaFYF/wtWCTofMSn3rY5bWvnivP9K/ApJ8mQPgjVm2BHG99uzd1qyU3haJ6OkYLeqZFXJhKPUBWzJmanroDoDWRAwVxKkq85xpIYzWVyZmY9wzToIl6mAtEg55pdDFI+SUdNSjFnvERJkX6VGk0oGXEnyBf8oR1AMmV+Jh2D8F62FYIHjnRht4LuzC5DMRgB+T17dYWWUq3pFub3cqP4rz5QONDOR6qJt/MQXzF8iHeAqsIvOdZbT093bj3Q8rAuQQ7nZO0VuLpPTdzrv4A==; 31:wFcJdSAjrMoYbfiakoERxMLFzjKhNT0L049BTBkBiV+9iTr+1hdK0Doebc7vx7LVAoAUE6Xl2beEN67DfWxjuE0uyLbCYroHHDxz8PyD+Wcsdoy0yGx5+F2AjAQ7NUX/6l2e5AREWVAHGZ0uxvZq66RPPCjM+mO41glRwRmiSvAg28HtpbBLPKEyf5ADau3oIoKO0a/y6ez9uCbV2uWd+FXwgXhskhmyg7lKjqTLAus= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:9B9PgKNl0Xow7qqHIjrze6bIEfsiL3V6I81llPNkfOn0WqpMbd7/x7CovfhN0gvLBA4NqCLmz3e5vdcOVzRDmjvcSUtoDGfk5e9mLYME1T6mNrecA74uDXry2MZa36MGs1+S+D7+IvnY5H1sS6H2RTnuH27aCqpzsBEEwOezqeQcERLVWKyfJMK+9tRW9HEmZ9Xs/4qXapmVdtDfpX2+I9VkcIk2P1BJymBMkixy0KEZmjLHfvnfF/8LvfoZBmZPxDGHIdje6fDrN0OcTsXSSnx8I20kpAXYeZB6UZcYyeMN1DlWB5tZ2oWNU18U7Y+eQmC4l3ZjZn/p9xpy/hDuDQ==; 4:UYqy6EA996AXktGtBLpRZpswLMdl2LUWBnauZUjaasGcHGGFBxi7GqKNPx3oM2Yvq+gOnJcqxrxXhu3Zc5qtCOXG33qseR47s2R+DDjKa7RE+tFtmE9jGwLoV4uuD6HimzKseR+EYWmgG7/3sFS45vDgeaq6H7f0CeJx3VLn45BLX3493OI24Mt8FCEkGtLy6dz9Lk3BNAYCO88cM8F74ST3puqXW1mEQtMdrE2ys4NtSERm57rDR+yrY7IR9XNAyAiCKhdjr4ivFNlUpyEBwg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:zuZVT1a82mODAaPpwSi76oze/UHTxBI914k4Kto79?= F3j9pqQBJYOo7cxmVrFpR5qdegcU3pha2QLj+UzG12ynyPX/Wgk5ue7vwPmGYG8x9rMVUjlAXQDMgVGydnNnIt4RQUNynH5OXfw7B1RfoZGo1ZrCQD0XVXLwcEhcfBLEyBswNsaT5SHW2fCHe1tafzv/U6FfIy2nRGPd7zDQvYPxxmeKDYwVGMotoZFgYA+gLM8miPPqB+rgEJ1wyLImzh4mBpHZY/jDX7lfiDtY3LRqTZD350YzLh9DKf+iK1wmrelLlswcBAxfHwTLCWGziRvh3S0kFuzy8PG2cFiBvtkidpsUqIbCtvmK04Y/WMnUt9+zyamf9kap6eS+PhdyyJkzCxd56ewxEP6YZPinJ/NzdU9Je6gjNYSTS00g1crZD1kI6cCVNJV226dEZmUEX4+7zfxUSEPIiUswCV/fUoZ85DB8BE4gVjZWgaLYb7MhjT8tDAf247yMlYOc0ghK8D/gsHXqHt5g23byocJtO0cqWRPMFrRu1s2jgFEmcsLM3+WhHFZf6TFnJU1x+9Bq7es9EfOpjzDoWMu3E9AYi4dRLPj9FDhIE9E1CPubfJNtI1LKroKS3ed2nhCwyOoODZc/l2E+qsfVswlf5utg2ni5L5BgluVXY1WT3JhDD8UOXO5hHpMKbKscjQnFfqF7G3i16eqZNCGDqc9sHAGNjGwUJTOfZ1sqBNoRRmBn1sfOivksTGWVy2h1uVUqivoagfZGnQ6hRQOHGKhP/ikIsahqXn71PysItP8GOOwpv+yLW3TPIxGxCf5ezea2mgHC8AznD038QjVtuQEaGuLeMu4aG8CHsV5uNXncjv5ECCJgoWzrM7d0MdleIaavot/AdEtEy3lVLrsDjY9E+CKubGom3Qm0S8jpazhbVEz53P4x08orjLr2ZZNRnAEncviYJWZA0DZOXMuMmvKa9D9bxnaEUnWXuUY/lyKBiG39Bbac6hRo+DM4ppjsOL1FQq1srACYVPuoze4o8rK/LZddtF4pH591jzC9z+M1WIlNvoHbIU= X-Microsoft-Antispam-Message-Info: hLsJnqDaNc8N5XeXVQ59Ui45pjWDOiWJRu6Bis3Y8Pwnc+uw5Z+QvqIVFPG15oPV7pOCNLrlyt1Y4X9N52/tzZZBQ5jFRGZYxwkQWk76h1W7uB+VA3N1cMF8g9MQaklcUKZQcDnbDvsU2oLcVOM6tMBDGPA6Pj1wfUb4aT3DDr1+uBAcFTT45e+KmlcNVOfR X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:cAJExgxJ3zLPpoV/nzr/Nsq8798+rOW4U5POlv6MJe/INB3O4n4M8SgFq4RE9jTwOuwKeHAv0Rl5iITNX7NHf15ninieWvDzULisKAojDJGbm1cz2dzwNGn3vWW8h809GyWkeqIM2nOwrCNGNqtNZ4lrDUDFQpf8JUlx6AioHKPuZPrHYlQBXF8HrqwQ84FfuBPSECpNBUqCMwgXJhqo5Zhxskj8rVrwvmN/Mc0W67cQv16O+38QEyMVYjcT3vW0WabpOkYHtrV6VLeSHXnQ8EQ6G+V4QrQP34yaXKgUD7kvyv7qlQFDh8k96T0vmUZ6J+o+WyYy8Q1EK96l1Ipv9NUdI7RoBq0TxkRnJFpxGtvv972g0C0MmLzfMeYjYNErYqbgfH632Jnc5fhYy/Buu10No4c5Q9LGma9cRyKYZNGOvCxLwXSp8zkHo+RtMf0BfNuDdRlAOVO0tzLxmklovA==; 5:ATrXIGwptFnCzxjQyUgjLTvOjEIr96qXAKMib68LW0O88UtJ/fozN10ePFfWCdkUr35Idtk9x+J2yAMxGOMNH8EavEGGus/Xeg7vwgmoA3We5WRTF1/6W8Ntukmk5D1PsTc0RUfpaPGqueEDSkS7V15NXPZFWzuI2WKjfHkM440=; 24:4UWCf/wXl7rZD8ww3n+Odu2YmQv4iPST2PerpjgTHAtC4OZscn5K6QsTGDmicN8k+oGHkq8CfrUJmbDkHLaCvouHmcGWJFzii7TY2iZgxQQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:Dtu2J+/f6BENO0DAMjVLGg6nT8aPxiqluzv1ThLeQSpFmmFBvz8WgUnFihLaC70Zu0oUOUh130a9fc0gGUHTrrFAxEJxsWdo85IKCrMDyOwQCWT1ZRiLOtkmtj3zC+L56TXaETPIX44lFHPpD2MJPxTjtWdq4xCROA95V5pdX0jKR6O21A1p8vRNx42bPnQs9S+xzpClWaMBcJ8/TsCsbZTNueJfiAjR+zV3w0cuu9UX9jxER6XIvNKEcWW/CEUd X-MS-Office365-Filtering-Correlation-Id: b9080c4e-27c5-4f8b-7e06-08d5a4e89c2a X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:29.5472 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b9080c4e-27c5-4f8b-7e06-08d5a4e89c2a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215547_290219_40D79351 X-CRM114-Status: GOOD ( 11.12 ) 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 [104.47.0.78 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -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 82283aa..8bad38d 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -335,9 +335,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; @@ -383,6 +380,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;