Message ID | 44b3c8c830c3333b910ec444a4d9bc213c17fdeb.1527629631.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="SkGPfi/W"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="V5lygT4M"; 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 40wRxL42VJz9s0W for <incoming@patchwork.ozlabs.org>; Wed, 30 May 2018 07:41:10 +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=SkGPfi/WjYmEVH XTuOaExMdEKc4VT+Bx/Fsrcd6EcOBlXNpvdWVX2wfFygINMEJs0WY16kMygESzzSGpDZ9oSFBUQXa 2sb6MCQy6nbiOF/kAKjNHIvstjwkzPGZ2HxkQi2dT/16jK4k7A5/hGDA5weCxafrAq6PhfNGXtzgb UFjWERoeMAX5LbliJT88863TQSL6FiHAHpVzIUTRFYHonuGo4sIOyfrip3Lw4g+saDhQuXT9CWAJh iNgLVcS9AJt3Y+eubHFhEt3TABzUwnWUur7rZXLKLJ+tkBbNh7pMBMkN7bo1E0RfBj+2IwfDINPZh ji01KIHPkxs+1JIjHnhw==; 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 1fNmMX-0006YF-St; Tue, 29 May 2018 21:41:01 +0000 Received: from mail-eopbgr40086.outbound.protection.outlook.com ([40.107.4.86] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNmLf-0004gT-Nd 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=ExQnktsnGEgq2LEsfn8mh2fKSbr1/BG90GYO2ErO6mY=; b=V5lygT4Mvaf0WQX0rb7okbqedOWz525ABn/AmpNzz0GrTDZq4Rogd5P8bhfdHSEx55bLLoDZ2taXpRbfDEpCeHnBy4MMZ3CB/TL8jHiprN9j+qGvBRXeOPWfc+BmuftiMBijj93OgBtha5RJ/mOedoCsFkGwkPQ0/RjKd4iG99g= 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:40 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v5 04/17] mesh: use setup completion callback to complete mesh join Date: Tue, 29 May 2018 14:39:08 -0700 Message-Id: <44b3c8c830c3333b910ec444a4d9bc213c17fdeb.1527629631.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1527629631.git.peter.oh@bowerswilkins.com> References: <cover.1527629631.git.peter.oh@bowerswilkins.com> 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:KwhgzMWv33ViQntmHrAKvUhXqXs8KL1Qoc9+SmYJyNRLm/rt1Ukayt8sAY8E6OkrDfPCtCpoNiOD6Acn/VjHWwDm70HzbsGCr/gm4PxuoD7l/di53fY9QoFHxi4YTJz8CdPXLL5F/qWwaXLOaW1VPoULCv0WQXg7UNFC76V7GNvuoadepCusmlcTbItFRqOPoHGNjueZWy5Dqwieg5LqAWFfnjKCGg574jxbAmFMhRostKvZXPks3m9FId0US4ra; 25:zkgolqO5J9Tiy9MWD4u2ca5VTziSStYMxjPHdTiyDrTrje6yU0lOd2l70BRdZdHp6XdTUEH1DXhUAJ44cACiAMuf1a7HPEH7o6Cp3VI5emYa80/XsU3fUXycJZ/u36HUMEqloQCNBvJAwHK9lKSPl4ID1NrEmT+dLAFgAhKu2M6Rh4HMJdrM1pO5Ie38md5OAs7/1JUEvcQfzBtye6RTA2Us4EOmQEV7elJ09FlAP2oyBogNetnfq8O778WVX6kkz6FjTT0xCb1/UYiiVV1dbwMw/Q2VU8VR+xj5BlBivRB07CuJcBs+pFbbcdQPXG7vNNeeWW3QD4DCVXGgrR5fOw==; 31:ZnZhw+1DhMzkSlAmPyqMm93OmxDhe3/d1zvRInCf38moR9PzZFf2VNYqe69V+xBhYqsdmPqdmPK/Rzr9DN/2JTy1jOzMd6lCA9TbjwePKUlZTMY5NyheQnWeKVEtJiDfhSFJN0ySGz17SWjZS5tObn8REAc8jPaYLUliP7HtnWE6/9ed9yf5FXBYW0yqCyeqoxm1GgK1tglnLLIufphKocZhar3B4tjN7xnL8TKOAdQ= X-MS-TrafficTypeDiagnostic: DB5PR04MB1654: X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1654; 20:lds7qkcbP2tV2xaSnzCrT5P1oAmhKks9lI3DPcWS+uPh2/8pxu+u4ysoXPr9GzIBGnVDz0XY9/KWtwdXjz5HonRDd1eYfyN5175VKFC+7+Y3emeECseq9CllVDVh6ot9RxAuqfBT5NZsKsPyD14UpjPvFq2kW4ldNCIkLzaTZrxEgpwSwyhykRFyDLvxyNnEVXMbKlQkuTMFRw5cWjzNYn0Cy+dQe3qauwIaSjK4AQwa41pETG3TlUTAGDtwfg+oQwMpJIRHsnrSI8K6DhIiwjAb+5uvGNXC2G6dLwB8tZGJ5LLe7lnh8zTRgHDbbC9M3+zBJWe+WBMdftd+IAduTboyCPBZngwX6G8MMaWqsH95UuI0nU9pL9bWNuPhGrjXWQjhPNBtxLAXDaeN54P7MW4NEni+DQ7wPL7T+Ab7xIk=; 4:fbcNk4dybu6bqAFs3sNLao3Ylizdak46flIzzoM71p9sPSF8JKwIStQoWyl4wHzLwH+sZyIGldQiV4XR/96gEi7wli1EWKTnB9vLYlapVbcqNpszfvJDlvMns9Ie/5SgQL+tnS7ci+xnDZKqHDCWJgJfiiC/rJRF+VWeA/BhZyaVMTTznSWrswwan9uNQnz7Lye7lQJpXnaVRTsPs0Nx+AC1fxgM+GjigN9zC/zJY76L5kg/oDyHGFEo1LLhNkiOYr4dvnTIzdWcNSH0hcOBFA== X-Microsoft-Antispam-PRVS: <DB5PR04MB16541210FFBBB53BAFAF8BDC996D0@DB5PR04MB1654.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)(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)(76176011)(52116002)(316002)(85782001)(81156014)(47776003)(105586002)(305945005)(7736002)(478600001)(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:xwOyA6AuqBz7u9cAPXfPZ1awy45+1vmz8H7EWyMtS?= EFHSDZKr6eW+s/o65ILB2meje9qiV+8BeSQ1u+kjZ4/rys4qOu4R4ktECl4Bv/KZqZ2X/MbUOZYIgpGw/RV+JjVqA4VdnhBrq/XSGfCLhKYaA2lhlZMM18A2dHoE4v9Ww1+Y5ccVSdf+T4xdLp3dpMopbWMNjDnQ8VBdraDcGMyPhCqgQDj4Uj6CNSTA+aYsy5bnJMWM25joj5DfvIrz9+pj5keqy7BykfsyLIyJ0Iv165cH+f33VnfPnsZ3KDcH23Ag4UfAK/JfuZZvqk79MX9KEtuuptxhErajFRw5BewrYVN/tVCvK/5gfgLZBxhyGrDjh72zphjILQk3RN157Jb4L94Otz2WI0ygg1yhuKE+l8Mq/NQbi21M+AzTO/xTUI/9f20XuNu0Ng786z6E1ePzejWedmMe3gi9gGmhSMlb1hDECuoTImFIJ059KDkPKXSa0xKiVnH8c4AUmyXjj2NdPHYOwOHv8AeYE/JkfjAcI2pJxO0tvrxYyiAKbs5KdC4hAYAndsOLjCq0f9NF8vJnON5hNyxGD8Ic2h1iLojTCTFVQ43gxjhuJTLBuzZOtpksqBpocutNMVFaI7vOKhene8H1+TX0rcZMNauoicW05pefQGHt3RVJbVWe4w/D0wxjdo3P9UsRH1auBlyeqTxqgQZOkdod9bjvb0BdPmQ9uC65ZT7KyFhH4GUThMiTLFaQB9/LJsFqQQv5KeEthbSEjs8vUgAL77xEqKE+WWE9loqCyvurVG74iWL8g53XLMHj+kCm08zQuh3v+cPHt3YbonnhuWBiLJMzzkT/BfPrn49tliDd6/018pspsNA14GSubRMMzzSXoIKk5k9pV5KTiDjRalUpx2xkqXA3mxB1u3dD6+xTYnCqj+lBkXwFYHI9gRF9hRyWyi626q+zMtdeuLtcsfee94fFblmmlXAAqZnKDi2Et/MbNmWQHACj5ahIEVtcYH1coMv2SGhkQmLF47xXtzxb6MGnBGAVQHGWHw5y7n7hNhTaTWd4voBe0t2bhd/Adwafq8Rr7njfM2ljfCgi3A7zGPM+dwEQf7qxL9xKSEXXu8hAEXPl5GfeQqfFrjHzPizGFeBCGK1AaPVjB2Ea4+1P9yfnaPaZ/3Qtf/TfzCjrBWxIY8WEkzJX3wfgGdL/mOezWjjHAEEYP9C7m4CuQn/CD12GAjwsUOYV5yZP2b7sC5OEAjOzStJ+KnIW2IeWZE0XJ8kDQr693Lsdb+4yNOMuELNlyw4wUiOC/8iHkblHJqPBZHx8+p7mcbdS135bQK+lCtLhYMftClxw55V8XD/JeU5kMMQWyPUi+a43a1bL8TM+zzHGVhsI8c= X-Microsoft-Antispam-Message-Info: RqaA3UmrIEBNwwaXxmyYd8tcpAn57vDJL8Ukwd0lU9XV6yQCLz4mhnsDFvB1ePOczyA1CcXB4FCP8epd1VPKd6piQ1FU9pFsj5u3OQf+vuSADI0UQ6dFhveZuDL+TaMziwqZft47h2lYCgq0QtHeSFqS87lXTI68RrUKkCBgWfOU3g9rCCrconDiRiM5N8Ub X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1654; 6:BwxBnW6qVDhNElE3tyaIGYdZ3nMpUA4N6lkWOggYWBVbAxxCZpJPTdZw7KH75nAvCEYUMt2mg7SeVpj5GvNUivDtPTiTQsS/gqLLDj64+iWEBSdeTh/0BL8vsTwS1lQ6vtmjfJ7/RATJ13lyDgpl+ToAGW7UuiuvDpPrleZgOMpESH6pDFzNhyAK0IVAMYTe/IHo+tk3KhVJKc7MjJmgpCLuXpsTSrn8erj5oTXGc334B8b1swiUX5bFPwkGMZk8VARrJteFsouFQ5EhApQ231t+T38yhaXmPMLVqexhS+gJm1azYyfeYawnDixq7/vbzFKnpoP2FV5bNBVDrMt6Q8vJnAxSE1RQHwd9ZSTevtSysq/X6bQ1qy3l1CIG04LbUuhomdjkYj5hZLLwLhQ6PSulkeSIH0cgqQnTHlAeS6cu4nBsvUxf3284fxbhB/f2c8TORnyaSR7mLAvtbf2olA==; 5:Er3R3N/JQ5FIPwQmrTPwRaUWBIrC3BhSRooeJ+DnDoZ2oFH7sZnybvkZPcFUj9qsZFbvolksAlNmCxZbmCRJVeYIx641wo6tQHp4XZnXur97cXa0vG+BQ759vpigffQeiOLn/S4oiac/FE3eRTE9IYLK+vVdZLdxVeoqxgPe/5k=; 24:N3lrCpDWAg30Hbv0zYF3dGpBn7k2f7pdLG3VWKs9zF5Ahy8drLBHq56K6W2ZHLswCtKiKxFq85JwfgGT1l8AQ/BzY0k9Kwtx/yeYXbGoZhw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1654; 7:+gcCM24BPektr77pgif7xQ+jjeX/K/1LOXRI08qXdfD1IlOMMHTSjVV2L8rYSu0o4aVYnp8MCeWBZ3b3j/0JdCB/m+ohvvn/6/HVmbxl3veMpNKsifoRoWlZv88gd4paWGZYch41/MPUx6boiKouwDhz50V8QQAOLrTvIus7+Vp3579QkUE80DHNOtoKZUUaqGtg3p1b9uzUmSXiBLF5OjlVBaOES7laGn4sQkrUFl6+2NWnaTcOlGaqUrIJ96bm X-MS-Office365-Filtering-Correlation-Id: 40dd547f-5a44-438a-ef7d-08d5c5acaf6f X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2018 21:39:40.4693 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 40dd547f-5a44-438a-ef7d-08d5c5acaf6f 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_144007_803751_82490ED9 X-CRM114-Status: GOOD ( 12.69 ) 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.86 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