Message ID | 15e8a5942b6a17c12df9aa4d584f7f18bfdb1c58.1527814610.git.peter.oh@bowerswilkins.com |
---|---|
State | Changes Requested |
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="P2APY4MP"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="ha4gyP4W"; 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 40xmL267Ysz9rvt for <incoming@patchwork.ozlabs.org>; Fri, 1 Jun 2018 11:03:38 +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=blUhvObmPbVH07LbQEazr2E9MeqpdyvXjnte6QY8cx8=; b=P2APY4MP1VFTFW iqB3SWfH0suBu8OAvn9VOikgMABUgKmt3LlS+m3uYRew1jJTerXEYIvzyBMKIpVSlpPsQ0Qohae46 DPBhOo9bZVFRjkzJBGbw+DTV/cWH7eTftOCyG35HILHcgtnRg0zqiNXcMxAKZPvXVw6lMNcB45iC7 d1oN79eX1pBtRsGAmKVr1ziHxrzydhyGWkatZHvk42kZB5iVrX5fSXB5M7ujsAJ5sCUzOY/HvLGdl c5URrxzQH0pJahs+3TEBGjaKNl9LTXcat3bwyb+rQ4EVhiJcvtSizuADg7Z70Qqq62YETYKTzTv21 wdHt39BmCsNltKccyPNg==; 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 1fOYTZ-0000oD-C5; Fri, 01 Jun 2018 01:03:29 +0000 Received: from mail-eopbgr40085.outbound.protection.outlook.com ([40.107.4.85] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOYSv-0000NK-4T for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:02:53 +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=VmhNda5E0lcHmzF980eFa1RoSsgVKBEUnFNiAYr1zW8=; b=ha4gyP4WK4bOvvS8WYO8ivkdTQr35o8ADntGshV+SVYYb+mcUP3FxdxfPvTlfdR4+DY1rztNrrUQSoKdsibFFU8U/tNbuyTBfDpHnL7azQfS05TwVeBJO/PUPN72UBs+forwCrVsQFjoBIBZFgAJNpQVBnG5roVV+JGIc5Gvd20= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:f8b1:4178:69fc:b611) by HE1PR04MB1657.eurprd04.prod.outlook.com (2a01:111:e400:59aa::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Fri, 1 Jun 2018 01:02:32 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 04/15] mesh: use setup completion callback to complete mesh join Date: Thu, 31 May 2018 18:01:58 -0700 Message-Id: <15e8a5942b6a17c12df9aa4d584f7f18bfdb1c58.1527814610.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1527814610.git.peter.oh@bowerswilkins.com> References: <cover.1527814610.git.peter.oh@bowerswilkins.com> MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:f8b1:4178:69fc:b611] X-ClientProxiedBy: BYAPR01CA0007.prod.exchangelabs.com (2603:10b6:a02:80::20) To HE1PR04MB1657.eurprd04.prod.outlook.com (2a01:111:e400:59aa::11) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR04MB1657; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 3:BOH/0SdASjxRyMyER4trojXT9MfGYF9U+7EvLZv1XegL6U0zKCCi210kkV/tjqhaWIOdJbNxrSWQV8NGXD6I90eRJEtbca9yvuKgxUL9fL4vMsdLQoh37d4LZ+jHI6akes1skTh+XOaaCn3BEorxdgbEKiPKyxret6cZI3aeG1mVrg8anBPcQydSVry8lQqvNxzIWubWaal4MgYRTKbtFYGwOoQJB/6WX9fqCfJO9tONe2QpUE80fwKigjAmaR5y; 25:BYU3nf3HLtxd+OfLCDrQh9vN+CeJ/enxqFHKHOJvuqIelrJJmc0JBzjU2/Y67UeC+JV9OcM6/d0Bsfo0dtXlYS5DQi/cQtn6QOBm4TRpino3rXTxCJ70UAPeF6rYHcYcgVknpfrNYuCoXOfhCCrUdwqNgSKkAuD5vMwb69CX4QAgi4uE1qMCTNnQ5HOaNcgb0yJFNLLG5ggQr0wOUePPNXxM9RZ+1hjZEdmiKK1lCZCaZiEPOiWmr+tOzl2+gbrGfNr6Npb23p/WvHGujGn5Ms/UrYE2W1kfRjiF6/tfz3LWI+guIFcE7g4pR9r2CytGcikZhniDRt60dUpDUMCnrg==; 31:UkiQLqITQF3fWaLEIUJ0qch6x7tRfVhm3uueOE8qPX/FptfskbuK7BQu2uQ2VVNe3MH8vR8kUcISqN6uq81rFCNH+RDBk1f1bARrcqiGKn6CmhsAKR/MeY2eun1VR4a4uwtaeREwaPV/g/zzWBEklnB+IK0tmxwcGFXTmm3FtPFB/2ltpZbd8J9dpb4kdwxhDKsKpLWkWFlpRZF8rdvAJ7boAN0su5NLdwTMBY0tVGA= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:sfRSRbOD1mvc/ZkdITPY8CwSgBlbZdJRROKLMVK62MMH+AAz2Fy/OePX64/zLHJnCVkDhgy8cDH8ORPULyIr4kNXcMFJsA0SGNyXQqdb8Gh4pBJVM3MRIdOtP4rEgHvE3Ytw9rEosAz+gPbGddxwy+w/9mFS3z3Jw+3kLz+kfMpVArHGsPidciSAVad4knCMpchS05JM1bxVKZdkZT6kaiQ1kkKK4LIG679l1mNR77KUloT8MXIfx0ecW8BfeZ/lKlmAxdFMo+reRMPLlQorylfgQputT+bsgFtvCr+baETGB5x0dmsqs2VedJJ0Bd9PVeZeZ7rTlnB3G6p4ODNAFzq358vqKewk3EZOmdtcjOGfGTvChyS237sjAzdsN9iGb2HLocAdSDPwFKoSK5ZVN2sO1ijy8UGALmwzk6tf7Iw=; 4:ix4QGhGPYn2y3X+5zHDG6+zvGspKOHjvMTn9z/de4qhbPX+byYhmPZX6DL73VMijQzDoLS23m1/FZbGNY5ui8ePbeanYQBzKyg1/ntp8pEzJ2YQETfkLydNE1eTrOCeQR1RhkNmltiO5noshHKuoRao3CmCZZ4yHYR2505ZmXfXdtbfUgCAkCm/GV5oVCnI02N6hFb5zHs6ki0wzWYlj6oxXnbhOKzCzcAt2j4gCjqp62RK2JwUnBpafCj99M0kFEbcJsmqvjETd/zhXBVwKiQ== X-Microsoft-Antispam-PRVS: <HE1PR04MB165799DE9A66E36DFF8255E199620@HE1PR04MB1657.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)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:HE1PR04MB1657; BCL:0; PCL:0; RULEID:; SRVR:HE1PR04MB1657; X-Forefront-PRVS: 0690E5FF22 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(396003)(366004)(346002)(39850400004)(39380400002)(189003)(199004)(6512007)(48376002)(105586002)(2616005)(16586007)(86362001)(6666003)(6916009)(478600001)(486006)(9686003)(25786009)(476003)(106356001)(11346002)(53416004)(316002)(6116002)(46003)(50226002)(36756003)(107886003)(2906002)(85782001)(446003)(16810700005)(53936002)(6486002)(305945005)(2361001)(81156014)(81166006)(69596002)(186003)(76176011)(52396003)(52116002)(2351001)(16526019)(51416003)(8936002)(4326008)(97736004)(33896004)(68736007)(6506007)(118296001)(8676002)(7736002)(50466002)(47776003)(5660300001)(386003)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR04MB1657; 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; HE1PR04MB1657; 23:IddGr+aSBNnaNqB1FJXkae5VkyUwyoTDp/UrEkSkY?= B/drpm50ZOfXx4AzwkAq6ONOIL7VC+hJR+Q5YEWAMA2jkhwvikXJBlLEg9rBf47UizTyWQAOt99d6+7E1c3E/UjHIiF9j3qIQjPJUaFqBS/HrMfhU7o4ElzPKBTe+3+Do5ybX+R1j3lcT7uxj5fZ9N2B4ONXyHpojhQcgPB7B/+3WFkBwauDekx2EeysIQ/aSy5LV44EBQeSk2Q9VUeGrNaOvayETHyKGnut6seGGsn/bFjd90E73OH8CXomqFhX/MKy6FcJM0Aa64y7qJKuaSz6cZ2eS7A4GDtzKA7UHfSNarbndmoBf3KhVQfaLAosUPH+yujH1kxsBbAQghLNZYPB8Jxijl3J8Ezll8Ge0Gh1PCrzwogunAKBCNK+N3AetFMvVlanotuGWPaTahiHfPfSPy5wlYK7J/+9Qa1COXjtyLJ3Xeb+qyCbkRBg1s9wOlGKkQk3Shyqqnt1JdHMYVZEh98so4QP04Ey7XkYXPYKunRWGUWXwVVsvcGqlieUzzzd6dXQALffAXTGJY5ccDKFYOv5RXruNSCh7jX1mUChTNRkSGJAxFT5bm23hH/TipuuN8WFr3VSZBGQ0jvlXAsiXXHUJh4wwhRTuj/zVnpUU/g/X6dOrCPZNtmUSsNaOHWVkfNll0iKB52mUcq1HGefb47uUpRrsH9lM+xc7ReyW8g6NHdfDSEUvsHQ9BtY3oX3ta9yVqDO/fhfe3HhYVB8nC5ippi2XYELJPzrhrH5vwG9jwacQ3d4CcIrMF3p2Sn9BebdO45lI/bk0e2PpXuG9QZy/W8HKTEt7MNkngcuJn5LhfZzohr/YT3mvAtvpDc+/sgUhEOeKfMGa08LoG1SzV+oLWS6DNyjvb9UJPCQmcNGLbUwwMZAxcGqrxRuqRyMBD64jMxIlHBcMB16B9Bv7LKdcjN7iDx06TWfAVRIilRNy/BjQvDco6BY9M4yksPYTWAbrr4fd6lxwe+xxiKeMU6tQevLH+XErsydt2yPw9uyLt3Wo+hTVB2X5elP3P2i6sWQeP4cek16MV7QIPcD4BANyoGFB7+03l2XS41YdQKg2rjql8sEFTKiR87jj27UTgAKe0wnY8s2zj5E4ZcQs7X8uWHUTrQTBQ08EpBWZA+ekpCKh7oKFoLOSVdz1859tqZnY070DjsQVcYKa4VKKwiV24kVB5xBLnDJ+MDlz+cucBZssJCySt5tdw/JkvVRT6sS51LiMw5t71+Cgo1Z7gp6/4+qme8Z6t6GDuU1auYnxQ8d3bPWUvDhrnsy6wqsI6uMKlzbjjvMyIeaKXH5DE0saXuYaUXVIBy3H/ayDHXpyHt099tYe24npeR5mQ= X-Microsoft-Antispam-Message-Info: ZT2TRw56vEaobZ9UqF6stDJWxN252OEfGh3/MtZ+kjAQxfg7fmO1aqk6OSF1X+JFOumiqxLqWrb+K6BdPk0KnUl3r9pVkbxvSYgbdaOkr0CN5rr4Mv9CF0maGpIJvy3mLPnAkeTXqM7jtgu9iZFYigMJcBMxYUhSSWCFVRY2/5GUZZ/Kv/WrtZcpdUK0Krnf X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:mhDnqzA3HJZ3J2oaYnsYkIBxZM2t9ztVp+JZRQZbIDzcIJA7jFc5/DAPTgfDejfr7Yg/BSJnoynsUAZgUswr5v+XrKb2chsxa1uElOsGf65Dj2mefMV0Uqz1KZmAubSBae+dhCDE8yZF8v9NDT6rRyzS++ED4YLZBQMfQMjekClSbHbRhXsn7RAutlqPChCGXfYb21pGkgKQWyFezOXY5plHCMj+Y0I/yyR5F0JDx1xRyvpFut/ikRxKaE+oClqnQ3L/mQQ3CXsrVQQfXUlb+Nw27SMZNRTUyVkxv3AKckduWyc7a3wLCby7qcgGnW87TqHuVdvF4iCMU3/1Ni9mXV6O8e/bBRZX7L5y6J+tFyUAvxW/u7RtSHz/niv1hLZaReHsN/Y3WkjvluVGqYcfy3g20XWxXRQX+Xs0XgOAykqVquA4rCpSwpSc3ohll0FGEDXRGs6cKbopoEncLhvyvw==; 5:oqvHx+6NiiUN0uwdCAaJcL2ariXCERB7jqshLurkWMmMF7OdBDqU8MI+55pkgeuPykguFLr0vZcl8H1wJKD4mUvU9qdKj9lz7ZEcgZP0tykqLSZtnZDKxGH1E7S1UxFEKO34Ri97bfGDpj7P2qARIMsMzeMNWU/LvAOVnFeRzYU=; 24:IyvCBdfAVy2aEW+zRKTXOMlS0ASKUKM3Qq6McRxUebNBj+5aw3YTYDJyhVhWlajyMFElDAjZHq6AvsnDipO+Maej+fdXcfpQp9J1uhmaJ0A= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:lQXnCplmN1radqDhqqRjHKzDVf9mHQleIK3mRD8bqyFa6wS4WboFgQhBV0+9LqKhRnxoPdX8NP5Cy7wLz9BIwdh5FN3P+ZkECCtlIX5xh7Ry1UNqGOt3rUuHq++WfXPo5i+1bDnR4o7VtLSXvtK9sgapiDKziwSFsWaKw1hzB4b+KlYRrpbUiy/tFhJgbfxqKOUQtwsGCU+Dw9ezV77kJd7x8pLzZsXzr6UwQU+FGNf8MwdZqKUp5K5s0Dn6CQxt X-MS-Office365-Filtering-Correlation-Id: a6f49e0c-aef5-46ae-2a7b-08d5c75b5bb3 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:32.9869 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a6f49e0c-aef5-46ae-2a7b-08d5c75b5bb3 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB1657 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180531_180249_198925_72A3B630 X-CRM114-Status: GOOD ( 11.03 ) 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.85 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: <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 2358bc4..868bfc6 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -219,6 +219,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, @@ -236,6 +237,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) { @@ -377,8 +380,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; @@ -502,7 +506,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 2e2f3cf..c483f3a 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); #ifdef CONFIG_MESH