From patchwork Thu Apr 12 09:35:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897567 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="sd/azl12"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="N87lU9IF"; 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 40MG5Z403Lz9rvt for ; Thu, 12 Apr 2018 19:37:06 +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=h5JLixgEFrrZmi50fFcZ9RDBoIMeaR2rFz2crVfq2Cc=; b=sd/azl12QW91KS URsYbDjCsUode5LFfAH3lAmQV7coV10YYz1P9S4txEhY2Rj2HeNuavXZ92/NqSE+GAnkPhi8mzgBn xslOtjmoJKdwMHFrijnwoG9MXrQR0UZS46vPh7DNloQ9PQ5U0hd/UMYAngFXcipcTLsn5oDm2wGxB 7AqDxxXfCysyxOzmVIfQM7kSlUqeSJtme5ofCKUgx5XRrqoz03U1H0AwassPf7udqGxouFHR4nwik VfbzhH4GD//9ouWE4Uup5Vz+duVgU//lWzdKR0koSwLWE6v2UfsL++Ct8ExWVt9vzS8hy8tk9JdYy gVoI8yDklVJGFV585RGg==; 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 1f6Yf7-0006Rg-Fk; Thu, 12 Apr 2018 09:37:01 +0000 Received: from mail-am5eur02on060e.outbound.protection.outlook.com ([2a01:111:f400:fe07::60e] helo=EUR02-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6YeF-0005nl-Ut for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:36: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; bh=8theQyBd3D0UMp1qsVYoWmpUE56enOQbm1v5fbErRcY=; b=N87lU9IFzcTXBbEooB7RWSBeEDIzASqLm66gkrgYWDDkrqClDm8wyfo+kYqWHNQajRgHTNVO/WspXdLJSayxDxDsBDYQ/F7qgSsfbdGZLENp/bv6Q+noe1S3QYjZRYhtBf5ZYaSFz2iKk4xZaSPYWPH2ltGrTFE+To19t4hHOtU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:7904:f0a9:f202:eb99) by HE1PR04MB1658.eurprd04.prod.outlook.com (2a01:111:e400:59aa::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.653.12; Thu, 12 Apr 2018 09:35:44 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH 01/15] mesh: factor out mesh join function Date: Thu, 12 Apr 2018 02:35:14 -0700 Message-Id: <1523525728-32743-2-git-send-email-peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523525728-32743-1-git-send-email-peter.oh@bowerswilkins.com> References: <1523525728-32743-1-git-send-email-peter.oh@bowerswilkins.com> MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:7904:f0a9:f202:eb99] X-ClientProxiedBy: BYAPR02CA0015.namprd02.prod.outlook.com (2603:10b6:a02:ee::28) To HE1PR04MB1658.eurprd04.prod.outlook.com (2a01:111:e400:59aa::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:HE1PR04MB1658; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1658; 3:BgHEkMx/yvS/ljYFgVXZUeXBudbrNV6t72cskqI/i0Bk4SV4f5+j5Yz38sGXNxPGfORUX2844Ko2a9q8AFnHwS6wyddYOo14Ne0nXBN+Xc+15DrMitZu/xlE0XUII4od8zVOxNYx+u0at+66MvhWSsO/AsvaGBF4+t1L8MY2w7zjNiCxePh4iG4XGc2MWaaROSp0pAh73R9BCjg3ch0c6+Z/97ywVwGN6ULESr8f7wO7v3JarqKAvcsy43NMpLow; 25:gya5zO/QT+5BioUQsRYSt1NcZ6rRGI3hIKQfIVDYFjYgaRQ6Rs3O5FMo+Ny3atk6EiADv2By0Jasxf2SUOya3LTyXkPVad+SaFxuANevTrR2d34SG7OvIM1pIvqVBFqx5NzkTwzdGUFbCYSzBo1Pca+Xp4lTUvz8lQLAUIKKqokt9p3BDMiZA3BhN8q9KGJjQDbfZv5QqE6TOp9EHFD0ch8WbngrfAXE4vJNISWDPqaFvOPIEjXge4CVFfeZwoutRyokah25JcLMqJzAAVg4/7SJ51Limra41YvZ/dvTdjPC0VaVEIHMzJ3Hm7dFqXU17py4ondzqAVasI7W4+J//A==; 31:/hb7lnq6yVlDZZAU9rCHPD3DRwO6KbPrB3/eboLPDJCfT/GmMI91rjjJ4jss70BqT26bpz4L5ddKNFsNaYKseq2tvqdOMdRPxY40rIspmEifdcP1tcUoTjloEBM9pWnCHf/ZronWVychnhYW6AJk7Dr9BzzjqJ/UiTo1At/QwvAuruqgCI0EBYbf6ZsBum/mBopuX1sSEoqPxGX4WJjFrbChM0R6QkIOJp2qV7Vn9CM= X-MS-TrafficTypeDiagnostic: HE1PR04MB1658: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1658; 20:+x4sXC7ND8OmUnJdiyamxpQ7tS7C8IFFjsT3jRRM6Sko7r+5lyCsZofubh6b/zJB45qgntOZKnze2LsCa19WIOeyGOy3igLvdmlyFGWSsYLImjjKjTsed08CEt5LqBfgdXTYhexokBARR9Uxz/0I0lauVdrAmLdtWb7Ao5HHa9hmYAAWAiW3nv36lctO6yqOXyMOY1la/uI3u3DqeYedb84v5R4bvLEVwY+RH653iE6dXN2jOGhbtGDkid5ZJYCqnWA4gd+ywkMKKo9MzCH+p1BLKfJFim3HCgbe6kst+EDflJWEYGKGb0FgPYLJb7jxwDH6rf9pfEoGvA9xft4yUA==; 4:eXsQANycprs0Y1z3r4AHdJd2pEDuNq2pm8az1g69aDBSOOd/VAEEln1am9/pic6qwz2rtCVmZ7FQgqcGHl5uRB+ZcXmfLldVTPLY36sX9taRVQ/z5doRQ4R9v9Ux0DBFQ1OyExzy35xGP+yAUfcCZLpm0ZRjSQVrGw0I1Ln1nLVLVBkWHfCaubiAL8VTWAYhVx+T4wjuFe0q9Bu6X5WuV/csiV69a2Oqwr3p1SJbTs7Jl+iw+yenCpFxypulS3zVm4erfbUTOIsuUBDJcTPgSw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6041310)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HE1PR04MB1658; BCL:0; PCL:0; RULEID:; SRVR:HE1PR04MB1658; X-Forefront-PRVS: 06400060E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(39850400004)(346002)(39380400002)(199004)(189003)(16810700005)(6666003)(186003)(47776003)(16526019)(97736004)(69596002)(476003)(53936002)(9686003)(4326008)(6486002)(6512007)(25786009)(5660300001)(486006)(2906002)(81156014)(85782001)(316002)(86362001)(6916009)(81166006)(575784001)(8676002)(106356001)(2361001)(7736002)(105586002)(53416004)(478600001)(305945005)(2351001)(68736007)(52396003)(36756003)(6506007)(386003)(8936002)(16586007)(2616005)(33896004)(76176011)(52116002)(11346002)(46003)(50466002)(51416003)(6116002)(446003)(48376002)(50226002)(85772001)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR04MB1658; 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; HE1PR04MB1658; 23:mh+tuJ9Fa7Q3YLB7CT1MMbNy3o2P1bBGvBL6igRZN?= mpAecm2DupJS1SRvIxMAOaegHIn5LoyHsF0dxl03Ud3vbq0p5iCxTCd8aKeyEIq1bBUnM+RlzbIhqK0d/HOfBy4W1NtD/rz17eHJGlu232TJ+uP2ZXmYJcdeliGXzdvCJTVHN3Q2ieNiyf1nodUdaLaUlmaxN87JXgPplrbSMzX9+c9s/ihwT6X6rHplHgrNxo9vnTCIYEEtK3mS0FeaGAMvxpoSoiQw9Sft5k3DUbwoHLO8kWA6Z3rqwuIef42Py0GPtX+gVs2K98CA5kFu/s9cuuacbm5AGUOhzH//7hG+62J+fcNqjZKx93A2wQXBloj5RCFDSIyEs30o81f0w62uZG4ujH4pJu5Y/+VJz+g21eZcxDU5XU64mdGJrrspabmNElxc0fH9F4UyRHL2GIOYgXK7fzxE/j7JACVa3DV+rGy3/YKMecY21noF/xm/E6Ht6HX+5t/frhwBq/WqDhAdZqrvCyyaXvxONH+JXX7bM8yDWmpJmi+ZiEYWbU7orCnaAyYLi4yoLYoKi0wviB4O9UaYHz/v1k4R9wWsOMo2hPIRfQW4er9WcuO3IfI7KtFjUTjDbCBaKtB5rwZNj8RE8sAucA9aUkybupZlo94wq4EAXUARGsEDWBo5PRHlZ3mqFc4bk97lCF79NrJlyOKapJYofo0D6ZOaycsencjJPeU/yZm4pDEA1kG1zOL+HcwHjD3gn0pcH4f58JzJr6B3T0yvf39ITPM6P/7Yx6kVODdSBrINAM6qefdjfQT3dzZJJ5XWHQTRLDG7q25XTxRWhzZKWK1CyOdg787HTT7YsywSyRr1r1vjlxxbRtQ7D29znbFOHJcHZgxvEcoLm3WNlMFPzJQr10lPDxLI/CQdVLcsVs2Q+SPzGLF6BGa/fLQAmWLwwhGUc+CkTZ52gi607VAGTN4EqWYBmcDiZc3c8QjABtclxEV+KL2AgrP5FU8urVAL3jIsAL8vNxJGG37m06aKwYJ6TlCyFHI/uWciCbMdDjO/ucd5eqCNF+8sVTtWzWMt4H4sGX8j5W8BZobiH1G8zs89vcHBmUVXY0P30EBd3GpyDW1u/OHDLtzzoKM4FMFYqw8qEbXWx+iAHg+B14lqCSoNHOskUNu3oMQcW1u5L8YTttH7LnjDQf7g3+IlrLiLozBXlUZKptJVGKQ1495Pmtf9ow9x82CyIZk9VKv8vuFV/htxsntk52zqKN0qL/qxyCPS5cFWEld92jhTRiITzfrzBl78Mz3l4ZNJFAPPRy+4mdCHB9CL7q/EwhvMvekArp3WpnkvU4jgTSwifeYARiwvoaDKuizZoZUfpJ+JgeH6hW0sBNlpTIoc6I= X-Microsoft-Antispam-Message-Info: tGE+Yrsowu/jUx2mqz5Y5cUBHO406OHf+XtLi7RAw1bMUAxPWJO1BGJYxoYIeNWy2zi3HNulIgwi8KztLT+PlbZRenoTOeDRraYG3k2CQkxv55D/B8aeiSv9xkiog0Li+mcNaOqB1fh6QVp0E8T3kTiDwlEjlcXbeM/mw6Crq4GYdFI418AZ4GbYwj30izzi X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1658; 6:brc+ZhMmMGLzP/MvRHNXbvJUGBaG+EL0hznY+Qa6KkRTezEFfJTP3Jh6CsSGOm43PF6v9k4klD1lA0EUbVdmV5U64kX3b+lqtg0NSHWUv/B6gHskyPAa4QFDeuXUwwmfz2mGcj67ez3P2Tf7hHTNWuqJKQCNdg4RGNk9YgXz15MEHGNWkFksb6J11YSN7eUhVUm3ufU3AATCXmm4NQW22qEdY5OtbyDuFjTH7h0FzHZyvtmZXYk1YNTbyD5cd7AJBK0uEKnpt8ozTDGjvG3MuT7BJIUWvQdinYpNovsNmh1/alw9X1Rv+tzeyb54FMyAHsfYXs8ZWALEYpC0UvaJSFBqkh003T0SRVxBAMzM+yea77EpY5E7V84j5M2azxNQ2siB6Kw66zRJuUgBzFutDiaxH67zYY7WjOpyIBV2IJgSyJUZVEkBIJ7C7znE6E+kbvOe7C94ExZVkmjSXKo4gw==; 5:i/fDwkd8C9+GJX+iZcnZNi0Hrsfg0EUfiwgn3lNOB1h8AhGEuzNYKPXRMAMAoBoeLBq5Yddpsf7oNNdRzL6chAY1vMLPpBOHIH2DvTa2TT6diU/k8PkbvFYsYwrKfzDz50kLD/aW4LpnvQgAXqhpNLBARY/It/6tFU/tsY+728o=; 24:GFGcwEQfWOOYx9KiAD2JtoYv+pyIE2yeFpto6vCfhwvK3tLg8DDQa6Vg96UNZVYJ08vytGDciLyNjMhyISBNBHQT36DF3YcxN0JTigRau8Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1658; 7:fOCWaR6AVI4Z7DuD4QJ7H0feQx/a9Dl1OHmAdX2PfWc+Jm7PrWJTQkwpycWhGah2GLrLiaVYJdy9ktsDjjb6ekvKHJUBF5hKTAk5YJIAjHdOdV+IuYvEOeheEa6t2dyjtZdg+tVrMHJ5uQ/XCPgGfclaBSwcpeqbjg7J9a5Si6b8m1JWMztcqiuHgAi+B/a25+z6+YI/MK0SoDNKnlhXa7ErRtk+JtmlIVwriWUjcWjWfIWZir2yhhiIrQBpyFzi X-MS-Office365-Filtering-Correlation-Id: 699fdc28-4aa3-4cd9-337f-08d5a058c43d X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:35:44.5516 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 699fdc28-4aa3-4cd9-337f-08d5a058c43d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB1658 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180412_023608_206076_05FF60F4 X-CRM114-Status: GOOD ( 14.35 ) 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:fe07:0:0:0:60e 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_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 mesh join function consitss of 2 parts which are preparing configurations and sending join event to driver. Since physical mesh join event could happen either right after mesh configuration is done or after CAC is done in case of DFS channel is used, factor out the function into 2 parts to reduce redundant calls. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 120 +++++++++++++++++++++----------------- wpa_supplicant/mesh.h | 1 + wpa_supplicant/wpa_supplicant_i.h | 1 + 3 files changed, 68 insertions(+), 54 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index c0c8f9131..f2f417dca 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -25,6 +25,7 @@ #include "mesh_mpm.h" #include "mesh_rsn.h" #include "mesh.h" +#include "drivers/driver_nl80211.h" static void wpa_supplicant_mesh_deinit(struct wpa_supplicant *wpa_s) @@ -359,13 +360,48 @@ void wpa_supplicant_mesh_add_scan_ie(struct wpa_supplicant *wpa_s, } +void wpas_join_mesh(struct wpa_supplicant *wpa_s) +{ + struct wpa_driver_mesh_join_params *params = wpa_s->mesh_params; + struct wpa_ssid *ssid = wpa_s->current_ssid; + int ret = 0; + + 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; + wpa_s->mgmt_group_cipher = wpa_s->mesh_rsn->mgmt_group_cipher; + } + + if (wpa_s->ifmsh) { + params->ies = wpa_s->ifmsh->mconf->rsn_ie; + params->ie_len = wpa_s->ifmsh->mconf->rsn_ie_len; + params->basic_rates = wpa_s->ifmsh->basic_rates; + params->conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_HT_OP_MODE; + params->conf.ht_opmode = wpa_s->ifmsh->bss[0]->iface->ht_op_mode; + } + + ret = wpa_drv_join_mesh(wpa_s, params); + if (ret) + wpa_msg(wpa_s, MSG_ERROR, "mesh join error=%d\n", ret); + + /* hostapd sets the interface down until we associate */ + wpa_drv_set_operstate(wpa_s, 1); + + if (!ret) + wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); + + return; +} + + int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) { - struct wpa_driver_mesh_join_params params; + struct wpa_driver_mesh_join_params *params = + os_zalloc(sizeof(struct wpa_driver_mesh_join_params)); int ret = 0; - if (!ssid || !ssid->ssid || !ssid->ssid_len || !ssid->frequency) { + if (!ssid || !ssid->ssid || !ssid->ssid_len || !ssid->frequency || !params) { ret = -ENOENT; goto out; } @@ -376,22 +412,22 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, wpa_s->group_cipher = WPA_CIPHER_NONE; wpa_s->mgmt_group_cipher = 0; - os_memset(¶ms, 0, sizeof(params)); - params.meshid = ssid->ssid; - params.meshid_len = ssid->ssid_len; - ibss_mesh_setup_freq(wpa_s, ssid, ¶ms.freq); - wpa_s->mesh_ht_enabled = !!params.freq.ht_enabled; - wpa_s->mesh_vht_enabled = !!params.freq.vht_enabled; - if (params.freq.ht_enabled && params.freq.sec_channel_offset) - ssid->ht40 = params.freq.sec_channel_offset; + params->meshid = ssid->ssid; + params->meshid_len = ssid->ssid_len; + ibss_mesh_setup_freq(wpa_s, ssid, ¶ms->freq); + wpa_s->mesh_ht_enabled = !!params->freq.ht_enabled; + wpa_s->mesh_vht_enabled = !!params->freq.vht_enabled; + if (params->freq.ht_enabled && params->freq.sec_channel_offset) + ssid->ht40 = params->freq.sec_channel_offset; + if (wpa_s->mesh_vht_enabled) { ssid->vht = 1; - switch (params.freq.bandwidth) { + switch (params->freq.bandwidth) { case 80: - if (params.freq.center_freq2) { + if (params->freq.center_freq2) { ssid->max_oper_chwidth = VHT_CHANWIDTH_80P80MHZ; ssid->vht_center_freq2 = - params.freq.center_freq2; + params->freq.center_freq2; } else { ssid->max_oper_chwidth = VHT_CHANWIDTH_80MHZ; } @@ -405,67 +441,43 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, } } if (ssid->beacon_int > 0) - params.beacon_int = ssid->beacon_int; + params->beacon_int = ssid->beacon_int; else if (wpa_s->conf->beacon_int > 0) - params.beacon_int = wpa_s->conf->beacon_int; + params->beacon_int = wpa_s->conf->beacon_int; if (ssid->dtim_period > 0) - params.dtim_period = ssid->dtim_period; + params->dtim_period = ssid->dtim_period; else if (wpa_s->conf->dtim_period > 0) - params.dtim_period = wpa_s->conf->dtim_period; - params.conf.max_peer_links = wpa_s->conf->max_peer_links; + params->dtim_period = wpa_s->conf->dtim_period; + params->conf.max_peer_links = wpa_s->conf->max_peer_links; if (ssid->mesh_rssi_threshold < DEFAULT_MESH_RSSI_THRESHOLD) { - params.conf.rssi_threshold = ssid->mesh_rssi_threshold; - params.conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_RSSI_THRESHOLD; + params->conf.rssi_threshold = ssid->mesh_rssi_threshold; + params->conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_RSSI_THRESHOLD; } if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) { - params.flags |= WPA_DRIVER_MESH_FLAG_SAE_AUTH; - params.flags |= WPA_DRIVER_MESH_FLAG_AMPE; + params->flags |= WPA_DRIVER_MESH_FLAG_SAE_AUTH; + params->flags |= WPA_DRIVER_MESH_FLAG_AMPE; wpa_s->conf->user_mpm = 1; } if (wpa_s->conf->user_mpm) { - params.flags |= WPA_DRIVER_MESH_FLAG_USER_MPM; - params.conf.auto_plinks = 0; + params->flags |= WPA_DRIVER_MESH_FLAG_USER_MPM; + params->conf.auto_plinks = 0; } else { - params.flags |= WPA_DRIVER_MESH_FLAG_DRIVER_MPM; - params.conf.auto_plinks = 1; + params->flags |= WPA_DRIVER_MESH_FLAG_DRIVER_MPM; + params->conf.auto_plinks = 1; } - params.conf.peer_link_timeout = wpa_s->conf->mesh_max_inactivity; + params->conf.peer_link_timeout = wpa_s->conf->mesh_max_inactivity; - if (wpa_supplicant_mesh_init(wpa_s, ssid, ¶ms.freq)) { + wpa_s->mesh_params = params; + if (wpa_supplicant_mesh_init(wpa_s, ssid, ¶ms->freq)) { wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh"); wpa_drv_leave_mesh(wpa_s); ret = -1; goto out; } - 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; - wpa_s->mgmt_group_cipher = wpa_s->mesh_rsn->mgmt_group_cipher; - } - - if (wpa_s->ifmsh) { - params.ies = wpa_s->ifmsh->mconf->rsn_ie; - params.ie_len = wpa_s->ifmsh->mconf->rsn_ie_len; - params.basic_rates = wpa_s->ifmsh->basic_rates; - params.conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_HT_OP_MODE; - params.conf.ht_opmode = wpa_s->ifmsh->bss[0]->iface->ht_op_mode; - } - - wpa_msg(wpa_s, MSG_INFO, "joining mesh %s", - wpa_ssid_txt(ssid->ssid, ssid->ssid_len)); - ret = wpa_drv_join_mesh(wpa_s, ¶ms); - if (ret) - wpa_msg(wpa_s, MSG_ERROR, "mesh join error=%d", ret); - - /* hostapd sets the interface down until we associate */ - wpa_drv_set_operstate(wpa_s, 1); - - if (!ret) - wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); - + wpas_join_mesh(wpa_s); out: return ret; } diff --git a/wpa_supplicant/mesh.h b/wpa_supplicant/mesh.h index 7317083c9..2e2f3cfbf 100644 --- a/wpa_supplicant/mesh.h +++ b/wpa_supplicant/mesh.h @@ -21,6 +21,7 @@ int wpas_mesh_add_interface(struct wpa_supplicant *wpa_s, char *ifname, 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); #ifdef CONFIG_MESH diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index d5bfa7ddf..ab5f88f66 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -810,6 +810,7 @@ struct wpa_supplicant { unsigned int mesh_if_created:1; unsigned int mesh_ht_enabled:1; unsigned int mesh_vht_enabled:1; + struct wpa_driver_mesh_join_params *mesh_params; #ifdef CONFIG_PMKSA_CACHE_EXTERNAL /* struct external_pmksa_cache::list */ struct dl_list mesh_external_pmksa_cache;