Message ID | 0284ed1caa0e802efd61978557c465bb987d90d0.1527628707.git.peter.oh@bowerswilkins.com |
---|---|
State | Superseded |
Headers | show
Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> 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=<UNKNOWN>) 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="iLi6hUim"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="ow2N6Qzd"; 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 40wRVK0XGnz9s0y for <incoming@patchwork.ozlabs.org>; Wed, 30 May 2018 07:21:13 +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=MZsaCl05MnDe2Vgan4cwFtlhIWhY9sEfEbseZgFsxnY=; b=iLi6hUim14+NLu J9Vh0RUT8D7fU3hO82LYyewSt5DjgGElkCex4yPOt1NoHZe17JfTE9vUkEPsf4H8yqMmgY/ZnVlRB shWXppm2RuLWsOKzAd6/nwVrrLqO5RPXy7GDA0jx4uSuZx6QyO7qPCAF1XatgMawGHyavQv//3wWk ZNHwYlLxRgs8BJpTtbFZEFdRiby4vEGAJjWa3gCLOmYOC/VCzFzzLXG5Kn9DfUYeuBfOzebPIzVEN 5X+2alXM5TrC+ZmTBY0BUXiQCT4L/2B/Uk8yV0Vi2VltEeRu/7FaQMDr9omaFuP1Y6gxIRs48mL+Y qjfMjN8p6aHNqaaOMncA==; 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 1fNm3E-00037d-SJ; Tue, 29 May 2018 21:21:04 +0000 Received: from mail-eopbgr10054.outbound.protection.outlook.com ([40.107.1.54] helo=EUR02-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNm2H-0001JC-5p for hostap@lists.infradead.org; Tue, 29 May 2018 21:20:06 +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=ExQnktsnGEgq2LEsfn8mh2fKSbr1/BG90GYO2ErO6mY=; b=ow2N6QzdUDpFluCzf+aP9xMo1b2ZfoRJR+9opj0xjZ9CCq0/3oL93CFIZbrHHKd7u+NTWuIroTAIZdBfW3DpPSJm3JpA1QyVN3lr+F0U86KW5Xn2tMrX0+B6l0B4mgZ+dAhmm5NKnalPMEq7mlqzDiwBwxwrJoNCJOlb8R5Wr10= 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 AM4PR04MB1652.eurprd04.prod.outlook.com (2a01:111:e400:59e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.797.11; Tue, 29 May 2018 21:19:47 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v4 04/17] mesh: use setup completion callback to complete mesh join Date: Tue, 29 May 2018 14:19:04 -0700 Message-Id: <0284ed1caa0e802efd61978557c465bb987d90d0.1527628707.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1527628707.git.peter.oh@bowerswilkins.com> References: <cover.1527628707.git.peter.oh@bowerswilkins.com> MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:bc83:1bef:7e2f:6957] X-ClientProxiedBy: CO2PR05CA0101.namprd05.prod.outlook.com (2603:10b6:104:1::27) To AM4PR04MB1652.eurprd04.prod.outlook.com (2a01:111:e400:59e6::14) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM4PR04MB1652; X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 3:dvQUqMNB8VFE6z9iMlJ7ck4CdAgwmXM+zRkdIbEC3WVTHsZK/lobKANJFDSPxJZYlL6C1ncUL9Uo3UQdcAjfTMb8m7BR+E4PLDSexq54+UTtV9QArF/bmGGHRsGDvMBIkby7/s6S64l9Fx31Visgu4AHLCmQ4cS0iEOI1wBt39UpvBWVa41Vw/pLLD7I8Ei9T2dJ8jfgd4Aj1r9ovyUUP/rhO8hxTkmpyIBvhHFZV981heUTbG7h8razGFh9C4oM; 25:rQfztXpuvcCF2zztrhgh3aQTw4uh+UFOCYJid4YRUZLcD5XMhH4Y/UnXUI5aZuQ5TsuoH8rExZVVvMgul/9dLhLEw6kQ8yU9Ec//AXCoGYaI/tj5XeeYfTlCOOOo3gnDIv6/Al/v3T0GQHQc1IZE30Bis7TUzbcMjhAk9jESaCk3l9xliW4kVqtvgWO5UhFs1Lhr3jQ3gYg8dg9+M67Muf/bQnzGeyW4HP9zqglkY3E4IEELWLWjtWovbxQ7USLapkCrHG5lSTbRsV0CGa7BMzhJCDQ5oFXbH+KqSmBgncu+s7pHGzKicUOiyjYqPPjrXRq2d2fguTzLdx852NAbOg==; 31:PLcYgcdiMKaiqjgwNvuTi5/mse9EQK3gC1sQJ2jfKOumWB6p4NmPtobQ4vs7aK+enXmOC5Xpak6CIK/FaqQaWmWRxInuqSuBY1mDt8Qjy2Nrk3TTgQ+P+Pfi+Xi/WlpTGUbGvq3hTBzr7e0QUXMXKc/JSixWbStIAppRJZWFQMZrE21tOyjVy6lur2B+IIg+YsilFDrmKp1ydykOsGa0k8RexO6xrQ2JwFuZjynaj9g= X-MS-TrafficTypeDiagnostic: AM4PR04MB1652: X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 20:3exAmesNzDUYMZoVm0V5KiOkKKi+1xidxeMhlXi6Z57Jioi5kAmicMjtJZPIabsBhr/wbCxXtCint/MENPrfL20jJpyuMB8uIkOkKsXAhZfw/pl0Zs1EZKOpbHqfLUgKNdkmFpEZZmcpG5JTzkAaEoXasiSV+T26QsQn9emvmwRpR91kc42Bqs9XycC/QwrMkSpsjE+iP5UrPftMMfgry7i10BPUaG2dsTI9vVjf8BJpsgXrje92qbaiS0yHcJ2S0TVY0Mi9S614OgqvIlq5J0njTesrTHk8wgNCQaXCuAHP0cW9u1gSTU4blU8Iio5QX9OEG5Qr10AEdSpr8QfY6mtsqCJSlbHwFCr0nvV6Bc8bCz2rcE9bDtPdRI5Nmn6mcWeVPp209M3wH/kYIOlmK+YoAGPJ7DujibLHqUseFjw=; 4:qtBcfqema/sPI+BlzArGVu0EH7spftiH+ZXHESYYzg2Nky8ccLMT3N8wodT6LNPSIhGXGt7itjddRw0ZQCYqbTqc7Ze+60X0ROAqt7mp68wrCLkT0BCPTwMRyrfxzzxgF5K1/iecixrCWhRGGGN1/2L0zRXK2SOFhCjmjaR8PJE/DfWv43qxG+JiYtU9OGKfMOy4nMFtS9qfu11Frm7MelnAmrMfTAHiT//uVbb5NbFK8cbsXOIUwihgNgt3FI97ZfVrrI/KfavbqODxBdMYWQ== X-Microsoft-Antispam-PRVS: <AM4PR04MB1652E8C2EF2AFAE57A818E25996D0@AM4PR04MB1652.eurprd04.prod.outlook.com> 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)(3002001)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:AM4PR04MB1652; BCL:0; PCL:0; RULEID:; SRVR:AM4PR04MB1652; X-Forefront-PRVS: 0687389FB0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(346002)(366004)(396003)(39850400004)(39380400002)(199004)(189003)(11346002)(446003)(68736007)(51416003)(46003)(486006)(4326008)(2616005)(36756003)(69596002)(33896004)(2906002)(107886003)(6506007)(386003)(76176011)(52116002)(52396003)(85782001)(53936002)(6116002)(25786009)(2351001)(118296001)(2361001)(47776003)(9686003)(476003)(6512007)(8936002)(478600001)(81166006)(86362001)(8676002)(50226002)(50466002)(16810700005)(81156014)(316002)(97736004)(6666003)(106356001)(6916009)(186003)(16526019)(53416004)(6486002)(305945005)(7736002)(48376002)(16586007)(105586002)(5660300001)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR04MB1652; 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; AM4PR04MB1652; 23:MzKjbJkeIb8of1zsoVbP4kyuokt82Iwn1mqiqDeIY?= OS3vU46pKY6Nt/xGxJpeafnmBGUGXpzvBCFFtLcq68TcGhV2Z4oJplsSabQNJWEUIcR5iJuWGrGmanuVMlMiN+rLP8jCpSCu1bwThp+KSjtqRsT9vsnsPVK57jVnHzJCBBXuHD1JLGUVleSLjy6yXag3O7kUnti/oL8iad18LAelNt4s4K+gJWQK/91yfGfeDWlrLVXVYDmvFmZnY7Z0E5rd0pZj7HfuiJko6n4Jl8syDinlGcN3jBM/45x62UIqNI75Cc+hQ8KXltEtof2vkvjgiL/CRdGH0a/MhA3KYhZ35o88nlwD8RtwdWFe1l09EHMw416HOEsncyOaKmiT5L9u1v+2YlUdIG3MFBFE9IMvtWXyswe/CnudJmIpnC9Y1wNhvEkxOFFuLhazVRi778ZtiHqLB1TEc60wOLlNpBzXnHWh0p5WdLb+ack0pVyb6Jqg5QrSgNkY1rgeyfRsHU5PGj+O8m0ldxaACGlBzF+EwRsXuS2EsXCD5Ydv9NekdTlbul64UJ+MZesHdeefdtrAFvVhO0AVh+hkbu/5CIfEBgxvjSdqOllUSWaeUbs9wDWw9AjiHD9xTss+i3lxp76gZgCaOBPRfQk6ozT2OyiUA4eHQCOXMPLHncCygQN9mTFTr3zY2LZWCxsNO8I7CIOAR0Mh9muAJqsLCZAhJ+ssCP4lk++XA7l/zF8HdZqvsCoY3OQFFV1R02hRx4JedVk4bkF+MFqa7JZPyQQwcgjBSH9iWc+4PRdJpZe7JQ0wZFBcAW7qspoe953v/1XhMwOZgk4Px8eECVQFNe080aT09F/+u7e16dUxmx/HXZjkCqC2DLOPgOF/h6DOwOqy01FHyrOmOydUiI2y63APHROWwuDmtkf9LeuM1l+TatlDcLRtYQbHYOBgA44sn3kN/LVkSRIt/QCwXr/ulLRKVg/L3WzrfmQXbiESdw5A4/5PMqhFX7dhA5azlVbQ2Dm6RW3X1mSsB5an5emdCFNwWqguvmWDBNHmP4/3b39hFgZIc492uVCbfCmnnYJcWe+THUDSv6CYBCgck3ShmY/VhldLHXAmxKGwUHurTOkAeK6h6fbhgVdO1nCHUA7Lrvn2118e3pFUvKYDwqXDTxXgWTo/O4SpV2ecmLRT+jNRNJwevtdZBSbE+2MGVkEfGrzhWpgioijW6JSUI4VOI+vLvlN9wBvlcCtNRkQ6OLQHj5HvnvDQwsqtHVjH5u4wWH8P7LjGyuZ3RmG8AFdjqEEnWEU82eaDapYaSIgltLRQGdujGtG2dCl6s6H8M6fXh5YldjJkcFnur+r6TfLwHs1OvZtRArQ3+blokyZhuwoNt1velw= X-Microsoft-Antispam-Message-Info: bA1a2j+qaKt9b+SR5qAaWg8lFcJVSwBRWWChMiEmwqic/mzmHFYg17uNlXt/KfkkR6aAYdN8o2qCmXbGOUnFhs9CKTDrN9cW8yjJbblc7OtYCtBhLfavdt8DrJplEZJb5uZrUiZGA4pmaUe0hF2zmAccpXFQPeSz8VQ7QaCNLQ1sH+SOcu4eqwRUZSfsSZnt X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 6:r0YNM+rNwnoRsAXOqSm9O8hE/m0rbbkLw2zTGS8/QuJ8R6oK8IxNu9aq6cACxP0BOHxmD89d9qXEDR3KdfXHvFAIh2RXzp/0BLvNJRCs8lOrxUWgU7kiAC5p3utDzXQFypXJMORExy+UWQJ2D7uyvpCz5xElNXDTi0ssheg5eqHXRR+6MShIyJ31ADmZZZauFX95tUW6/BUAKrtQZjW+x8Trlqvuxm39ZnNdUPRrotXoWAjedE9n+o31dplbHjxDhY+keEJAGYXD57bvtAQrIKFWYNd67UVYW4j9qgRV18d3WrtMZok4OoqV5aYaqZL/R4RsVe8sAMLJ8nkkq6QMksLzLUd2TLr6VfF4X9ytHmLtVZ+XpAWMn4EsmMsplKRZZll7k2+DMywDNnsP7Pt63MNCAdWnm14c2LKwyP+cWWa3c1DLCRvjNmP5kv/Y4pPMw8FQYhO6khwRq/VykXG9mw==; 5:fuPkQEJOpQ7+GNLSulwEuQS/OGyjy26Qf6SbLozhVnv2p5ZvFW9QemmX/TjbhmEM2wOBmMlwTrVW3ZYWVQ8BJ2RBqx5SQbYDsNeFLqjQDFH3ntdrktjLfqrqWn6U/5LLf9VQHCyQwSeUvwLVAgUYAe9sjWzkIc90aWaSuJ4NY3Q=; 24:V/zHG1+0uknNK4Wzn2K3wccoNljRf5HPbYNFFuOv93cXZOiGuuwHvWfP+Kh48ujR/tDIGtqeSYuSdsUPqOpmx8zzViGU+zXpi/HxDZZdUvE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 7:7szpHfMhAjPrahT8eq/V8swLI/TdHKxCiAohNMDUqaAulc3GuaN/fISXJR317NiNyyjeJKC8NBrruwwb4Gx8KHDXKTULwHwoqlkmHyP5AxW4p8kgDrZVkchDauwxFAvqE2tXFMrpnaHpmV0aR6wJwj2rryno1w575Vyr5nQvtkgZEOAsrwmtr8sp0U23Gi+MRE5cxv26708j4UxCav8Vp9YPVnXc1v+EILasZDrO7zwAbY4hjhBBOtE7eNgejcVw X-MS-Office365-Filtering-Correlation-Id: ba003d05-8195-447d-6088-08d5c5a9e8a4 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2018 21:19:47.8949 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ba003d05-8195-447d-6088-08d5c5a9e8a4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR04MB1652 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180529_142005_242634_553D412C X-CRM114-Status: GOOD ( 13.47 ) 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.1.54 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: <hostap.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/hostap>, <mailto:hostap-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/hostap/> List-Post: <mailto:hostap@lists.infradead.org> List-Help: <mailto:hostap-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/hostap>, <mailto:hostap-request@lists.infradead.org?subject=subscribe> Cc: Peter Oh <peter.oh@bowerswilkins.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
mesh: enable DFS channels in mesh mode
|
expand
|
diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 6a88149..0bc2b98 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -217,6 +217,7 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, if (!ifmsh) return -ENOMEM; + ifmsh->owner = wpa_s; ifmsh->drv_flags = wpa_s->drv_flags; ifmsh->num_bss = 1; ifmsh->bss = os_calloc(wpa_s->ifmsh->num_bss, @@ -234,6 +235,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, bss->drv_priv = wpa_s->drv_priv; bss->iface = ifmsh; bss->mesh_sta_free_cb = mesh_mpm_free_sta; + bss->setup_complete_cb = wpas_mesh_complete_cb; + bss->setup_complete_cb_ctx = wpa_s; frequency = ssid->frequency; if (frequency != freq->freq && frequency == freq->freq + freq->sec_channel_offset * 20) { @@ -375,8 +378,9 @@ void wpa_supplicant_mesh_add_scan_ie(struct wpa_supplicant *wpa_s, } -void wpas_join_mesh(struct wpa_supplicant *wpa_s) +void wpas_mesh_complete_cb(void *ctx) { + struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)ctx; struct wpa_driver_mesh_join_params *params = wpa_s->mesh_params; struct wpa_ssid *ssid = wpa_s->current_ssid; int ret = 0; @@ -498,7 +502,6 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, goto out; } - wpas_join_mesh(wpa_s); out: return ret; } diff --git a/wpa_supplicant/mesh.h b/wpa_supplicant/mesh.h index 9952102..2e2231b 100644 --- a/wpa_supplicant/mesh.h +++ b/wpa_supplicant/mesh.h @@ -21,7 +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); +void wpas_mesh_complete_cb(void *ctx); int wpas_mesh_init_rsn(struct wpa_supplicant *wpa_s); #ifdef CONFIG_MESH