From patchwork Tue May 29 21:39:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 922417 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="UI2ObmOQ"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="Q2yXzjM0"; 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 40wRwp4yqVz9s0q for ; Wed, 30 May 2018 07:40:42 +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=9gj2QA40VYT0fhRztnULjVgmsYS+bABop6kXOWxqd7s=; b=UI2ObmOQcV3iso Fb5FBLDQ6l1KBII6vvFjLpRxYYqVc/o9dD1i7+GA6DrvFeotwTAqbJWA2VLkoUVH9PoSFnJjq9M7d ey6Y/swZzknNrkuXxVaxSZJdBkGw7BtVdbIMgictaV9AbQXeBWZ4cYtYAyalArevzDSLMB4HHvNcr dxhBV//eg1wrOsU19/9105bVDX36wD+aiNx7hm8yPvMALsHBY1G0/oG8ImzTGcGhTnPfm2ZR61iKD CgNiTgI4DOM6tD7kirpryR41hHRL07j+6/1+957PK/mkOnyaOGjDNrYFKBhNZdl+lXd2jXwrDLxCQ 8+y8Nhvfj5LHcuv4nD/A==; 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 1fNmLv-00060t-I6; Tue, 29 May 2018 21:40:23 +0000 Received: from mail-eopbgr40051.outbound.protection.outlook.com ([40.107.4.51] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNmLa-0004iU-Tf for hostap@lists.infradead.org; Tue, 29 May 2018 21:40:10 +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=M5y0CEkA9/cOCXUYsFUTxUxelPnJimBt8wybjENyVbs=; b=Q2yXzjM0Wpy4+a3BPPFJYXjviQsO036qXjAY98xKGdPn5DtbB7T9RtkqNmCgj+cS8I5afNL1rtj1E1JfU93di4yjnc7aog4+XTCHJvZtLBYfcbpKhDmnELW/of7BKyytIdG58sWlO5qOSXMBLUbwP+oKP7xPgRqs4VpibSZWkDo= 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:38 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v5 02/17] mesh: factor out rsn initialization Date: Tue, 29 May 2018 14:39:06 -0700 Message-Id: <722cae36e2650c5c5e7c2b4749b4901c50c608a8.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:3M9s2w1gGW8TgtSz5BcfEOe7GvuoQuzQ2wrECXW4NWfzcbWPV0Ewgw/JTIRNYnw6ByRJKyCez6f0wepMHYIsgVHaqlV5TnuWuwmimrAnFJig4k8eT4vDi7zZmdg6vfreDMNCuPUC1V+pGusxviBFi+lCaVPAXaCRQRoGTcjOOHLFQ4tIKy1qwyMd3rePXZt+vNj0XB/dYvakLmVs/yKaNOD3MyOxsiV46FdMGBGuY3Rdk4RbWO6zucs2Wl/EM+8j; 25:y1EXeg7b1mYf+Zf/egp8AgCYwWY4Qm/r924eVk+xR56KcbcwaLp+JwQFb7R+YQeaFH6axFn1GY/R8p9jCBdZVVWsoCUZ/sv14UFzlGoXtaa5m270RchA7hvUEtRrPaBMh96MdQnxRtLy4UwOKH4gl7lIScueB3hkPh28DCMO1mjZow9KqGat/iz/1YDckeJYhdXYKHl1jHO29FJ2UXggN7bJQLZT2cYEASdah/fqD/s9e/cWS7yrGWzqXIGBONzRHkV7pRkxP5f8ZVPqt88QSLvpnecu1PLNi8Q9QlA5aySchgOtwVsRhNRQ5n2S6KtxHtKsCpVqiXkhYy3XxojMGA==; 31:krC0PpmZgDtFx1mmotwjNit9fFyl/9xcVx/KNC5mVKRKoxilXMTm4j2uu6IGCJdtordFTKHKfvxAxc6bRdXpyXBUVIzcRyOxVvPJnX9h9N6KalbyAdaWNmAw/cWfF5LgHBYgKEg7j3xARG2UeG/kJFRrF12dESEcASNMryjTlXgTRmep5Z+hq7It4yizgYXcLwKGDNCjZ5Em26JZvVXzEEjVWjFP5mASyOOUUgYOvpY= X-MS-TrafficTypeDiagnostic: DB5PR04MB1654: X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1654; 20:xDLBBotY1Y2Wo5lKVvSpQYwrUbwNZU+Nb1zuntD8LioO0W5q8SRHgMlWKK0y8I6yCC5DnxmcyKRe71CLu4uVQYsjBmPhRC0TGDrOlpXQE5v30d16NuZfIPEL+BrYKvDmrroUd8iM9ciQGUIhX1R7aGlT98FxsXX3pgU481Uf9s8EyaCZaNJo1rxFcv8SWN7P/uq89Ve3+AsZIUN2TCidUWjRGvDHOT8gm69wPB+8+J9EZIWZwiydXcKlHYuOac8I2Od88/wZS2t0knzdq+RGz4aeExp1ZXyv5D/JG+FnAhUqk91tpKipmeQMcYHXcO3vUSUPMi9j+YaJvlEJAb2uNk43WlOti8pOpajQ6R7d+pPScls63tldE1ENFqZ8WhVbqemBVdVGJP5CmVxBhunfeddk1P3+X6RQnP3/TaVAgUs=; 4:YPuNt8dXsOrtyzNdDNOkguQv1aEaPPKbTYCgog3+L0OMYl1TwO03B7nJQWkUrE+1Ex8xJ680yOdvCAQ6htGkw9ekp0aq/I3ehLHyKEF7O3a2XQp30qQlF1Xa5MRL5+04H1nHFX1ng9Zu5iZEA4tKTu9ySAQu5AHYo23f/48ao0jc67S5lfjFhKDHMHFRFW2RfVAZbFpPy6FsTACjpReejaPo7kNZVbhf0XxkQ0HB1C4YVIiqje6M5yFN+C1xFlmXpmJV965yWcz+JfI/YKTLZ1VKHBObqfaMx91iRzxwrNyk+5W+YK7nqSbwDrgZVKoQ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192374486261705); 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)(551544002)(76176011)(52116002)(316002)(85782001)(81156014)(47776003)(105586002)(305945005)(7736002)(478600001)(59450400001)(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)(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:0cjA4XY/sq+Yu7lqHKT/rPSThzGinaNCR9Jp8fmxL?= KhjQjZfmcmCdrzP+tyRrQAqU2vuvJJW6KHPjrwFBvZ5zu2PYVUEHhAxZCeAd8p34xoSp0090vQMJhhwNI58jjjJNW02lxTQOVoh+0B8FdwXX38xro+YtSZ/P5LrbraXJOQyTfUmfUjFYpIvZiJbJIswCz0tGjrEBiRp5EnYkaolwyKzvS+AhT5SsX5wf/u83vBTLMPKsB74pc/VyVMCxry1Or41dg4VuHmpb/ErXakYeto2GC7klqhcQfXsjf5geqBKevt7k1s75ww9mrS9fheAGrMeRvansqXKJwyLHwiVf0UaZomVwPglNpJ/jACabtwvioN7SW4xt5ENshz1iXBiuTmoLpoaZxeBCgao98OMfDTOQjmoIbISXinSt6h9jtff+iaBpB6nPb6rfhrUqR5qiMXLQXihzROSYPQsQ9IittJ7ieWKxifvwXDAJnjttdeo3gbHkUIsCdwxlnPus49OOc0mPG/LoWa2gN8yBs1ggxn+7289fBX64KNu/091K+bPBinWoOWYtXcJxSVRV6R45fIYu5WUFyE7GlH9OxxMcc3FBCDSOmMuRzqwqMC43uCfKxsbBVME/MfoDxtGvCd0z4ID9jomFwO+ymsdaNq8/tRcLaRS5I9xh46EQD5HmaMngPKlO1J2Dt0sm0ou3z8VVx5zfQ7PXlI4PCqVXVaaudQsIEewa8SwKMuvPWOjxU+1zHAOBfMaYgw3JRmv5/S84Sbr8y+DNVcvpD9LaFAC5y5ww8lvnFsYB1JtkHN7QgsRCj1+UVbZH1oU9uQK+bxhojBNE+1aAsO9WA9/H7dU0lkNXDdKkOv3dX8QtGn63fsDDfYuHv/IcDbhaDzSgSC1Y0RPfxHR6VMSCXtinzZQFA2dlDZZRnZUNvtiY7NUtyE6HSh5fLFj8FB0fS3X6U1MyD2jDqWHNmipf/g4XHe6WCJSvTyXFDk4odxAUg1qoVQsPc9nLavOHY2mysTYe95xra8sNqumjJY/SY13fdq3/PL1iBlSOwmGOYPDRvdOoktXYoOzbaqtjrnl8vVKHjqcpHpO6lxfAnLFZF1HjQ9mtUozAWH3pm5Zs9UVfUsHlu1jxysRIKvRexL0LuSNbw8ofXaizzgQ1RjLdfEanTV07RwfIVYBfaaqw+qiYYXpHSM4JMquaC7L2kF9Iq470rFpdwORkaiv44b75mGQtc2VJCMJo66kYBuCdizRnj9h15iPtxJvWP5/gAu2kZtW/TDNFOW3bjFRS0As673PzOdRLgjzs1O2MwGy0UxHS7qrzqVYX3lMLMvkRVjFWsDGPl3yZAf20CnDD8PLlZ+5KQJ/lapj1eXaP/B4VruTHAP7KZl8vAqznylhZQjlyVm1fgO4zxjfTMwJXikRYAKq7OX8qg== X-Microsoft-Antispam-Message-Info: CJ3ofGm16eUFpdfr11ZTqmPTi0664mN9kwDxyHKzoR2DZBCCUBjFJ8gkXgJ2n1DRjbCPcU4RouQn6S6TSQECaJT2kdpwo+2Tswrhe53Q2yNfMsr3BsGgL9ZiWknLqDUaTuUh/CogT899wTR6eg9n13/IiSRS26eqoUouTw4t/eFjEc3yKWHBS6N2CvJx+Eb7 X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1654; 6:DcOQgJtlJdVcesn3OiKZraZxUf84gYTlrY3DQSnEJSe0P6TkaQvtM1iiRCPLARnt/dGeFm27fWU8PI2j7RaCDLUwNRjMjFt0iPEmc6GvREP056TiLWKmD8I2FKscDfa0OKAIDXHVFHmLXALhaTuoeG5+O/+2uraKKlB2GdBZdkypraOMOkBrBez0K7ztffrUiCIWfhwU6QFEgACczCcYmODa0KCZbfQcm2uuThFs448EVjZTXdTl8RUkcaNH0DQb7EZJ5APtpB2CXckpSULvFTiefR/EqnYa3zLOfEiqWTWmbERHb0n5QChXzNgHOYU5BJg/00iYGA5En9qMVKNQyQLd20WjhXhQ9XBuoZHcJ4UOq6eVdhCUgD2CymLKIuW2Nu2GlBSMBt4LzGhFL2dcJ8KvJNboG2q9RJS3MQyAS0GkvC85m5dpuPNo115utyejNs3G91Krwirs6dMAvoT8uA==; 5:JqsoxjnQFdljvYG1hZTt+CJ5RfurWZgV8Fp48p3CvNbdXMjOUmSm/UcUBj2yxmBTLRhv7vdLQZ9DTwvSj0EJXRyvl1albbjUzjV0WyvrkP9Kzpt+xoLVez3enlKdr7ZgfgHFE+ppq2V/UjJuMUwLokrd3ugNY4Oz4/Zd/8LO+u4=; 24:F1jmgj2o8AQfOQeu5L7K1EFMWRbW8JC+jBVFN+IRnFiDx1Y7V7q9TSB/lOTBNkwgNmx8y3hyjv9HLOv0qaEQux5dzbvzC+YT4FCEYwcbHrc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1654; 7:iB16X4LsjYGqv/fFhBD//Gbx13U7WZlXS1TgTNvm/ZNLhbmJix9/Hvp6bmY/ppC68FpsBh7e0BJe54JEBvnlrjnH84PeCXTAgcY+hEd3/38MkodTTISMCb6bhTS08GFTGSprIMJAvNwyaCrbHJBtRfAfzRiisWtU6AsxppGZ4tnPSPhMSfeGG5sbIy2EIZB6opABLAfv2oYO7BA4vt2elIOQX6ujXF2LMYJOBoCSTf7KBoBWeg8yA/5yoBqIc9Dq X-MS-Office365-Filtering-Correlation-Id: 9365440f-ba2e-4d34-a02d-08d5c5acae23 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2018 21:39:38.2894 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9365440f-ba2e-4d34-a02d-08d5c5acae23 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_144003_156762_F1BE3AAA X-CRM114-Status: GOOD ( 13.15 ) 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.4.51 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 initialization can be used in different phases if mesh initialization and mesh join don't happen in sequence such as DFS CAC is done in between, hence factor it out to help convering the case. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 84 ++++++++++++++++++++++++++++++--------------------- wpa_supplicant/mesh.h | 1 + 2 files changed, 50 insertions(+), 35 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 87db8c5..9e46501 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -147,6 +147,53 @@ static void wpas_mesh_copy_groups(struct hostapd_data *bss, } +int wpas_mesh_init_rsn(struct wpa_supplicant *wpa_s) +{ + struct hostapd_iface *ifmsh = wpa_s->ifmsh; + struct mesh_conf *mconf = wpa_s->ifmsh->mconf; + struct wpa_ssid *ssid = wpa_s->current_ssid; + struct hostapd_data *bss = ifmsh->bss[0]; + static int default_groups[] = { 19, 20, 21, 25, 26, -1 }; + const char *password; + size_t len; + + if (mconf->security != MESH_CONF_SEC_NONE) { + password = ssid->sae_password; + if (!password) + password = ssid->passphrase; + if (!password) { + wpa_printf(MSG_ERROR, + "mesh: Passphrase for SAE not configured"); + return -1; + } + + bss->conf->wpa = ssid->proto; + bss->conf->wpa_key_mgmt = ssid->key_mgmt; + + if (wpa_s->conf->sae_groups && + wpa_s->conf->sae_groups[0] > 0) { + wpas_mesh_copy_groups(bss, wpa_s); + } else { + bss->conf->sae_groups = + os_memdup(default_groups, + sizeof(default_groups)); + if (!bss->conf->sae_groups) + return -1; + } + + len = os_strlen(password); + bss->conf->ssid.wpa_passphrase = + dup_binstr(password, len); + + wpa_s->mesh_rsn = mesh_rsn_auth_init(wpa_s, mconf); + if (!wpa_s->mesh_rsn) + return -1; + } + + return 0; +} + + static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid, struct hostapd_freq_params *freq) @@ -156,9 +203,6 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, struct hostapd_config *conf; struct mesh_conf *mconf; int basic_rates_erp[] = { 10, 20, 55, 60, 110, 120, 240, -1 }; - static int default_groups[] = { 19, 20, 21, 25, 26, -1 }; - const char *password; - size_t len; int rate_len; int frequency; @@ -292,38 +336,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, return -1; } - if (mconf->security != MESH_CONF_SEC_NONE) { - password = ssid->sae_password; - if (!password) - password = ssid->passphrase; - if (!password) { - wpa_printf(MSG_ERROR, - "mesh: Passphrase for SAE not configured"); - goto out_free; - } - - bss->conf->wpa = ssid->proto; - bss->conf->wpa_key_mgmt = ssid->key_mgmt; - - if (wpa_s->conf->sae_groups && - wpa_s->conf->sae_groups[0] > 0) { - wpas_mesh_copy_groups(bss, wpa_s); - } else { - bss->conf->sae_groups = - os_memdup(default_groups, - sizeof(default_groups)); - if (!bss->conf->sae_groups) - goto out_free; - } - - len = os_strlen(password); - bss->conf->ssid.wpa_passphrase = - dup_binstr(password, len); - - wpa_s->mesh_rsn = mesh_rsn_auth_init(wpa_s, mconf); - if (!wpa_s->mesh_rsn) - goto out_free; - } + if (wpas_mesh_init_rsn(wpa_s)) + goto out_free; wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); diff --git a/wpa_supplicant/mesh.h b/wpa_supplicant/mesh.h index 2e2f3cf..9952102 100644 --- a/wpa_supplicant/mesh.h +++ b/wpa_supplicant/mesh.h @@ -22,6 +22,7 @@ int wpas_mesh_peer_remove(struct wpa_supplicant *wpa_s, const u8 *addr); int wpas_mesh_peer_add(struct wpa_supplicant *wpa_s, const u8 *addr, int duration); void wpas_join_mesh(struct wpa_supplicant *wpa_s); +int wpas_mesh_init_rsn(struct wpa_supplicant *wpa_s); #ifdef CONFIG_MESH