From patchwork Fri Jun 1 01:01:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923693 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="Ft9F2NP/"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="RZ5UzuP7"; 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 40xmKY31kzz9rxs for ; Fri, 1 Jun 2018 11:03: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=MIESJMEB2fu9ArvqMwAzFm0LAgOXoR3wXwhe5B06BIM=; b=Ft9F2NP/tkdPNs tg1WITt/M1sIlyGvcVbN+g5BBGu9eILDYCFTun1JVt1GYic4NxxHPSQScr3zjG6da12bpyaMVbH4N EIx45R0ekBTr3or6sjb6PY1ycST/AwYi+fqDobvGW1CUfKz9LHAqMcs2DdKGA0UfjTrKOxaiK1aXa jC+zDRXIIOlr1XDBK2kxXg9ifswE7YwjATkapHjZLRlQqA/gWo5U57vwm4wYwDGM3fjnSf8tQJhmS xfPM4x89nsVdnz/aTLMWVscjLrzsglr/ZTCB0Ia2p3hj5B5HT9zJH1ROf3TSZcvctQCpE+QjW+OCs 37IvXMiTg/8ACdpNKOxA==; 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 1fOYSv-0000R5-4J; Fri, 01 Jun 2018 01:02:49 +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 1fOYSp-0000NK-7e for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:02:45 +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=z+7x3UVESil6KalUj3VhFLxwmrtbbfvfalW6N2G10Sk=; b=RZ5UzuP7aGoFk4JPaZpFYJC4cFDXnWLhKsyjyBd2izoyMw9YS6/sFCXKN81G4JBAShbapJkF+C+/WBI/EqfHNKA9XcYHes5/VTu0KiZF/6FTycliuXGB85rRcANKOmLGSYON9cbsIyxV0skOE29ioaByBSgJDc2xbWIpeQuXIXo= 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:29 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 01/15] mesh: factor out mesh join function Date: Thu, 31 May 2018 18:01:55 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:JQer9yML6T1Wa5QkuTfF2tItNFq5rACOKZwS2Mk68yAKnh9ObJg4R3WwoyowDK2IHMz4zn1iEl8uQPLlQjbdeuvTA6gJaFTex8UvckbW5PeufhQr8ytMmU36qLG8FPrfULytxz1zINekYfXyZ2uruSpvJIJBJsQPApiXNeGpIHai5ZhFo3vR+xb1bsv8x1MHXWWnWWka29tHP+dUa+jvHJExZZ5OFeGTdf6EjhVEWm9VWFgNZ+tAbewjXrBETJ4+; 25:zlYYnL9EehqjIvwfe8IpvhAFdN2kQp/Sa5dpuqztU7qmFo+gHhN1GPTdIlS7HbwVMvhWAJS/vYx7Yr1o0zqpZY15jWesYivUtk6h8XdSTvV4mkQe6/Fhgv+95DPWxk/9uSmMS8IR2sm6HwkBNl+cm73p+6vkE3OCJzs00Uimuv4S3ZWvMwM3kcqgao9V+H11W6cJSJwapI02fQEsR2kPRsFk8rBaG+I83JAKfqsA3AgpEQT3dy4WFEqwWGYm+fThwWHpLzw7x9eXwKcT2EjjDTAGtfYzOnbCMJR0Kc020joelQPEHxbtHdpiOyz2IC41oSmhWIarccR+KRq5SBQqeg==; 31:ezDS2D1tbVjQtjk3kIYFKKDzlPOnB1DPryD0mDwSkNyQz0DpiKP0rpXe6I50Mw664d05aU1toqX2yhC+h+rrH6IF42DBfPyLKUhu4eWdrRAGAgv6DkLPjpXY/fNEplUqV8f4+O7yx7wWilTNleIUkSRNZe8eaHuyI2Vys03jzGRq/EU50D4KDUSO+6wCvodZFsXyNgfduyrSnSfJ6iM2oqGfpwwuvo7TugjPOig5AxE= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:YVD2gPcxqcwf2ucm3t+DankEVYRK/pKU41QH7E3VRYbFhRubknKKrihudAIFLsyaJBCw/JBLYv9BcupjKy1DCYD0SIq58qmHzdtvnlpiGdzwXJXxXFKZW94MLmUTETgB9iO6ijfsguEzOoeDEkV5JQkSUqON4PceyVNQUXZULIEHqxc5M8pfeTRC8wiYDh/yGO1CoBIoit88Umy2WYEZj9sKE58HKD+uoLdhGXgqjfiy5gqVTbqZ8h5DROyLaeFhZxU5xvnyJY0MglUcDDkbk34kDhpcrR0DjjNBMcCoifqggkNR+bMyVY+3SasoDb9pLjH+cbcmeOBOuyt4wQWhZcewnPfT5hghpNCZmJ4vLugvaZWRux8aJWv5oz229hA8I1Y1FOHoc5o/xJ/z37eWr3ueOsVrUNfxWrsIKPzK7Ic=; 4:JbFacoZhe74kg7R2dVxLAn/t/itnAMgWqZIs9kHY+dChDMKiLJhFJxjWk/Ziy40TQ/jq3AwrxzqUoh8OheDDkR6e5Xb/m6lsKqIoKTuOv+Tp1PjZEvECYcXntlhA2SvVLfXucXKzj4U58TBrzxJmTQCjcVlSVq30zFmAYtlXuu7XQ7DysY01K99AEgCBtAVvvONTk0V9pi55gH6lwndZ70VRE5GELRd7xQm5Dg7v03RhmLg66qaHA/OkiGMB6HF/MpxnU/0HvKgJr5upLQxRPA== X-Microsoft-Antispam-PRVS: 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)(52314003)(189003)(199004)(6512007)(48376002)(105586002)(2616005)(16586007)(575784001)(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)(309714004); 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:PARHxxK9x1dXgFUMivjoPB2hXgnuMaa+mAt6P1tE2?= Sz6ieCShtm4otH3WTVY58VaWPcDph1xFCtnbEcwoZ+FyFYmtkXI7iC+v0QvyPbkd9kps9braeYOIebTOGuURssOi66a9lzpvV/Sp8N7xWrpN/4bxoHJDyeBpyu0pnd9/tLFMapUrZjNIHN54daKQ9wLNQQEIeVaM/wU2vNTOn398XerQOZ2U8vDGqQdl+hFgAcHx4SHRF+gIpKkBCGddEbxR85glPFxJvAg5GhNsk8yTUG+m66a2MWTAk/hE9HkPSRkbrKH2aEJM39ogO7ALAxtXjbjpYglSd8W+7mw9SKVGzR/jiqslH0TNlJt8wZevUhDNfEgXX4JEIr6yPMij+kqFAb2ZPhyJ9KXf1dfHxYm9S5seLJ95awr3CsrNzrTqf9TTDHH+hWCCgucYrkDFNtk3dsuW1yrgXKPBcVnR+MNjjEl3YSxv4seIGQygMScKgoBPqSxDvKzSz/gVpz/mnPRW6xM0iLcSOCeAW/iVjDMK1zNL3hQKoDCUoRbjaGqHXoaU0USn5wjUm0E7CoPOSgoWlUOeEv4r3TJ4m2IuWhxYjsUbE12BxOAOOZVYfogZfCaQdn+Z0Qy9TAFdgdbw8yWOE4B1eVrEYHK9O37iPELxQuU3x3Np7clKqZHGekCNfFPPFEGJGwwaCZwkA35dshuixtPU4SjFaVsJ/wmHLvcjSrjHdn0R4Ol8PXBjT+QLN1NZclCbDlSyYlc8SdClFlTNGVF4USpslDitJlgNu9+uPfRLnw40U8pxwuY6fZrWzePVDInCrMM7QuPFRhxghGlckAJn3s5x1Ck2r6pQAqkuUfI2X6RaKKrFaakGw8+PLzdNESDMec8dcYX53YdLIQA9+DW8qzSq7xB5xwtkqInirB4j+iszbBdJz9Th0WDOYlAvSdF7JQLGK6YKnLV7eMWyn+uRKAd2P4gMUUbnV3HZPFkST3ig3FmgNVcZGSZXXjX9zOOHuewvgcQNav6xv4ZZ5A272R2I7DtsFYyZgIz5igAuAnZM8pQwUD4nPHE2K8tE+7rA2vw05DdLMt1fXVE3DRf8lIEObeFAvMx/PMLK4/VumqR9ywzAU+k8D8lUofrBAioXoj4pQgaA3DUCRyFj3yzqhlrVqG+rZT65nc5n3PQPWjW/F89qjZZFnF7EZCZwjktirJ4hG64NXvPzwDJ6ADYQKu/bs4gukFgatzXaSQKoa61U2ZXbsHU0M0fgDVfFER64sICfFpiZxeCxLF2+56de2GiTDPokIwiXcD08G0KUs+9sciEakfFLLK7EnYB8L9nSZ/A7Zo8dIOONjzStEFLJkzzkt1ISnYm0lWr+bvkA3s/8u9HI95ApMWGYRU3uLY4worJdLooB8+t803LAgsV0UFYZVK6laEUskbW4uzwgbZJFcendAOhUtR18U0= X-Microsoft-Antispam-Message-Info: 8UQ/X6JONb92c9Kg8jozaBSexPiDDBbZxq6C0DhF9/odvik7tONGDXmpscT7Pm1qpvErbZbTnndwnPEag58+WXo4fU9u0JboD/++zpw0q7kE+Ohss0Sqkotp3cRkPXILQMR+a39d1KQ11sbTM4SRPMLNC0wcFeOb3Yx4nyH+2EA0hKciUqAGFlNDTmnsRvx8 X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:Ll2Xnen494bm6P+ZD27MY2+W1AfDhe41VF4hwzkONETaEGXTdCb5m90lv4s0MgZF7XzkebcB55I1Lu0kWIMyJjwkToaPMKN/l4sinJuYtR+Ja3X07LXLFD9klH5Wx+l/u43UnTGPCfnjRYreC1xpMCJzOTprZSBy1SnsVI9EHBndSpc6mkKuoGN0Eg/QOYgjmr3DiVWSle2Uwhe75HU1Y2oR9+2nMjsE2hJiQJnCbvaFqC+m9GoGH0t5G3X5cxlXwhwdfPd0PYrYo9oUIa5s8ozWrVbPfHZQfUB8kNil/3l2Rv+VNQnybTX5Wi3ZF60O7zLtB4D7dQLCsflsdletkXLW3Ama3mKH0M0BjqloUY7hl4gwq/z/lwhcaEXUg1wIxUdwIxaP0khw5e5cbAGDNZWEEYA8pwLaN6Oekb7ZRhA4mGdByytULGyJ9gyCzVwweKCWVe/dl1Hn607HHTQwsw==; 5:0GXU8kW++haZdNvzrefX8TQzyWF0SsoBBvl4XcrFx+I55NzH2JmN68gop5uLdLfWmIqaPTPnL+itAa5aNwYn/Y0s8NahorKoJKIPATjkvPB3x7xc4xW+FnkQu5L5sTXAMn3dXklcS2o1pZ+6lQnfKEfhagOc6p7W9A0b10iQuP0=; 24:Q8cZRjvn7rL1pSUBtGy41DbrAJ6vGjB7D3xVRI7+Ps83Z5qQglTNWdPQeiF78MmDYN4j/DeK+52fHkniDgyIxl88Fyz3EaO1bUqk021W6R8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:hshtDCG0qKbPlUrICnCCxZTZGMHiqXoBdvx7Fdhg84/gCdaMHEe7d8pboFseWQYwsIsC+YxG3+MGf3LXTFSfQ7GNujSOehFjnjvS6dIsM0Zvzc4A1OzKVqDWQBj/Ch5StexNX3jD5aFUrspRIPKusyWBhnAEnTufxER3K9QSwrRHU3JPgL8IU5N/x/DKRQjaZVFFnFKuhGuysDZeCYumj/FkvYLx4OF6mrMoaNkwOx0ov6CHg27uwknL6VO2qk0r X-MS-Office365-Filtering-Correlation-Id: 692f6947-f123-4fee-b513-08d5c75b597b X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:29.2680 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 692f6947-f123-4fee-b513-08d5c75b597b 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_180243_450049_E8832D91 X-CRM114-Status: GOOD ( 13.98 ) 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: 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 | 123 +++++++++++++++++++++----------------- wpa_supplicant/mesh.h | 1 + wpa_supplicant/wpa_supplicant_i.h | 1 + 3 files changed, 71 insertions(+), 54 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 38b9fb3..577b5ba 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -34,6 +34,8 @@ static void wpa_supplicant_mesh_deinit(struct wpa_supplicant *wpa_s) wpa_s->current_ssid = NULL; os_free(wpa_s->mesh_rsn); wpa_s->mesh_rsn = NULL; + os_free(wpa_s->mesh_params); + wpa_s->mesh_params = NULL; /* TODO: leave mesh (stop beacon). This will happen on link down * anyway, so it's not urgent */ } @@ -364,14 +366,50 @@ 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; + os_free(params); goto out; } @@ -381,22 +419,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; } @@ -410,67 +448,44 @@ 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)) { + os_free(wpa_s->mesh_params); + 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 7317083..2e2f3cf 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 2b0dca0..3fdef82 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; From patchwork Fri Jun 1 01:01:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923694 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="G3FnnCkB"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="UzOQsQDi"; 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 40xmKw6szwz9rvt for ; Fri, 1 Jun 2018 11:03:32 +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=yVm5/miFtaAqkJM5KpJ8VvrEPiaGrwNJ4mxNbbx7oEI=; b=G3FnnCkBBC4sR0 xBd86kb7Jn69w1hRfMuLNsXO1alGT/o47cxzDxZn6CHlwTZ0hC4IP0mzUcrKhKCWEolujYHD6Qseb odg7J/LQ6hwjwUVWhHu/BEsRFBzllnrO3lIEb36oyXzwLu2Qlwpuu4oexKkFWx8PcikiYDAVA/dUZ dIrzLHv+kWgRlpKZBMBmPL3nV32kZLb4XBbqRuvu9L2X4EVXcOhP2u3Ff3AAhEU6dn1kGLJQTIrie R2q80oM1dzfcjrTFRPsa9fgtnMUUwHpsyxc0STLlaivetAu3pbtC66UsIhy0tSCJJEAOQUnh+sr56 3k1UpZjmnjrlkPeDM2cA==; 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 1fOYTG-0000dC-Qa; Fri, 01 Jun 2018 01:03:10 +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 1fOYSs-0000NK-2W for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:02:48 +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=HpgivZXVFBHfh8Mh7fO2yUlr210HTV4IWkx3u3VIEms=; b=UzOQsQDioNEXYoJDBJ6mrsr0cpllWxfvzR3DNBqel6DNZp3rQTytBF/cBvd3iFYL98VISxwweb5p6Egu7WfQEFgEdrMkn4S6XieuIua35Q3UQ5pRD1GV1fmpFe5APmfTKH8owTRxj+phoF9O6XLWF2NYyPdOniWRCbxFJPgEzg4= 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:30 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 02/15] mesh: factor out rsn initialization Date: Thu, 31 May 2018 18:01:56 -0700 Message-Id: <1f2b6d7f8a5dae29610510b2cb72bc1f445f3567.1527814610.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: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:gL3Mfo5QfoKxgdfDvOGFC8369D7e8dBD5mG0JjWASz0XvRh4SkJkR6fCdbMYmGvSvjUjuxvilJtHxjP+YJS4fp0OBRz5i1iIw2G18CQal9sjLli+i2S2zJx40rplRGHAOxNAqngyC1z815tR304/i5qrQMNZmP/P9EHkc4LAIq/WwUKcVZJVx4jgIokCixhmRgjdOpa/ZGwGBRkG0O/0cI2/c79x9PmbRnrq3I3JMQZ1SNIuBMmBOXVfhNhIVQav; 25:7pGmkPAvQ4zk7zim8qiwgVSfKBGnstBENnrv/xspyyF+RYGQaZYz+jJXCDqp/5zWUmV/4a0RRmBBsKFe9IHekk7AG8/1UoIyaspQeVeKTyYQ904lFjS1H3jp7G8yGWcPC0OdxsLMu/Y0uWDyE0G6ng9k9qxIkDEoMTbZk3fsV21ow4V+wxtIBg2MY+Wu7AY8aRH1Q9xZC/f0BBWqVyG0aCzkqBaHVPkUdxTdNb+rqBaAhsm1o14TPAq+KGst6GhE0IKdeO0MqHa14ZWeQgDVou22RkM8Zt1qvRXTlrSBPMWp9r/tkwmkYLc18x0cqR3w4k4TiP4voTeIaikxRyqQeQ==; 31:YtQzNwqxWNG/dSMh4/OSVx9RSkVBJpqiZ7XCvQzMNerNZNegYD1AXgERAisKzAjW+2N6UJpHAYg5xlVAGwQfz1SB2ZHynKcmcBLrP6Moyg6vpAJkhQ7Nex80mQUkwcqhI+AacFOQp6goibClhx3bL3Zst4BpHXv6UF72sqoKLnoMDXFCKc0quaXnSkrpEdvGF2LYAo1HaeI4vEG4/oX0GXVTvZCdVTuN1GlxUVFjBF8= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:A+L2Xv8EsI+PvxIcixHHDfSF5ZirBp1H5ZfA5OT56kq32Od67eqfXcknDdnK/6vTFGL8l31vdDJd2xGaSEgQfdGxH4HIsdKZy886Dfir9K5go4UFWg+J0gIljnGxzeRIJ+4zTh+jXMTQFU4q+lCJIRbuBIMWJn9K+oYzBvMhYxIhYULzvyqoGwfANmEuXDsj4KKopNp9duhWjYDwYQtvBO62mq0XxcoNLxS1RHsQx5yQfrCF1fDUoypYkH91yx2fOfWVz7ctP2dmCmDSKU178s3he5tqiNJIe9AKDICVZvvlPpNTD7YHseNzxgaVdvKHhW72gEcg23C0S/4BGITzGYeUZvle1Fm2kUOGSCR/bq9NxALVqmWC63yirlNOMusYwCpCfFG0mnimLSUtUkHRTyT4kgMrnYL7HlROUoQrUvM=; 4:lptfNDiC7UHwiP29whJ68pbn1w55r0sOb1gfZKfb2xgDuOX+mB7addywSwGKehUB0FgOe4yK2pVVskim6dU9OWR/e3OihiwoGlkkj44bPSgYFH89yMy5JWI1VfMbec94jcZFjZGdjjQNiuABVDc3fGWVRySCfe7hGlueDhB9jFMZQzScWjLwYHxE9hYlWTJ0JAT9JbJBUacgckiVI0UFDgs10tM4kHtdj3AY/pHONBRKCdBWmjrj8jcQ/6l5jN06c50hTaXbRglOYyvKd0e0TtS3B8LjUpczbP+6a9frDGJQNf/jIh/OrrIHgBj1gGgJ 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)(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)(551544002)(107886003)(2906002)(85782001)(446003)(16810700005)(53936002)(6486002)(305945005)(2361001)(81156014)(81166006)(69596002)(186003)(76176011)(52396003)(52116002)(2351001)(16526019)(51416003)(8936002)(4326008)(59450400001)(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:DbSWJzQUQIANU49WLWAle4wHsp0dnbnM2dF/GQ4LG?= tIL0690CqWGmSE3BHTUrJXfP3M2vk/oAVK8GVOnPpCGI64lgPFs665gdetGGp3tstsBv3GDmdz9bnEWRdTf+FvkIN+hWFkTXNykYrxx3MintraCJu+IBn4twdWYP06s34v33SxnjoBSGjhjxBziVc2C7In0wS15np+wUkuHn2mkj1FvBAFRbOf+bnVafSCl8Nnei+HpHu04fUSGw1XEi4kTKrYxcuA9mtk88KJNGW9qj1/QUn9DHkPkgikzmTxODH40uhjRbcKsmWKUkOQzAy27/f/YNYGl2jMUC9J62n45YCawSc5/Yd94yeenwe/D3b1f3hHK7oDoWcli7QF5gVgVr2C1yNVjDwyLFWhuNz4389J2D5ybwCBVg8WLoRe7uQyzNgdhFO4SR3n13MdVObe/AkG6y0wQcbL9Q2jWh8EXt9anp20a3MjlYUT10zdGHTiN3kUE/LZWGhnF93XO7tJ6s6p+JTfBJWTwIzyWWdp7XPT37z9vuj+JrhqjiMccFgZjq836JKkHPs+vXvMfxqzFMQAm0jXGCYzWAom1ytL0UceYxEkujysgwMwLZeM9/eYwPUWKHTIzSD0trYyf8d3K954ADTlvaTHAKflrxIYt3m0miTtpSP1MWTurrvLvcxKjPDusTp02Haaz9DLR38C30LYvu/O/3N2VLa8QJxcEmavPj4C1io+O28OHvmQZU7E7k1Y0+ejTKJAM4Uq/UqE4KqLoZ5TTb8xotq+AtIR4zQxu1LgH6mD6jm+BExay8camwLRrQXEGAGiqHPfhQSYHlxWJxVFZkgs/vv38r6hF9YTKtqTEDXD/JqK9fekh7MDbWgI3NELhseEaBTXGJFW97kg8UQ6Mg8+F4UV5Jsz35OhdCtiFa+H+nw5/edASRxIGdOwiip4nPd5vIduDX9QbrrU7ojmNd18Zysp9P2kSToe634GabHk0J9wL+wIEFPAN3JQ1dcWLCJGMLmZOScAteDs7/LsyCSl3+I3cnztACN37ab4UW5MRw1tWZ4YSsngjdrhVTKyUWlVW4y77ZxRl9aR2RBI7wtfLasL9GXTCKjIjG1IYFkqd/WELg6dZ2SvgkWjBzeyMk5xwoUhA9laWdzNZj4DMkB2kHG+mV6I6g9lIRChAGyCRTXx5VqtI63cche/GskLqpIfaEszTU/3pw+BX8xE9n2Dldh8TYNvitOtDC5n8G27BYVDaEwHJrHXShy1MUaNZF6XDF/L2vVJLfqCYC0lGlxwaGy6kl7T7AEKh8RHjFURNQ+YPforS5lGQckZFdxmP+zLWxNWeiH0nFeqSKUz++iEEFDyj2ZhSZEqtoFL52wIoLO9g7zPMab/Fb8cA5e42Ah4ZbdQtl32Dj2pgRf8mLOcTRzEhKDN9Jw== X-Microsoft-Antispam-Message-Info: eb6GnLPMoHLia0CFu1Vn+hTx2XdsRclgxdD3sItwTQQwgbCJn8xd9SaMSlAs7W3M+sr7rJ5WH7MHCOTZdnVIYOgwAtewt2ZBf0RTXuG11QydsKy3CA8Pe1en52B2fZ4AXYQsI0t27/Dp/4Xz93RuoMFSCA49Nm+u1YYI5vxZvXyU/v46MqYLmJNVkyNsXrAU X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:l0r9YsUFe206iBDo4xbBBeSV8FvZ2S6h4PazZp5TN/DQ4WhPfkAR+AkhUYfD/L40Hc9oDEVt4kOA52/z2F9Jrk+YHA6V9M/SnVPCsvV9eTJqvv5Jc8P0OeKd6tGNfxlWWJ92uPOSDu5uUY58F2pdCoSkhRfkmuOMUew29BOXeJa5z2WI9P22FlPHHr1B4Ni/Qbg14o51YzINGD0A61OQsXIJNhtfgE7D9No3HKofwQCKUoTTWTzuV7PlcXSIcueRSnaG7hcszWsQW1K3/aU50z+Ly66X0+WRWzVftsEpD8qjdyLZUOdsFjeT7epC/izTMla1kdvMslZnVAyaknDI/SbaqPr5yW5Ws7x2NOqVxVvtWR12GY4ccajKbXOsSNtrA5Bgv4X6NUEBLECcCKlvSe7yj7tBzYSdmMXplOyWTM+F2sAv8RdSLSytTTx/1rFo/hk9GDracYk7dqDwVTjY6w==; 5:yzQ4oHvulz0BQ9aVjDZTfZsESy+7jdIwKks8bT6BrHv9y57D2uyVqCnZqxLPCNlSnLrA49wLpO/J+ZBE5v4u9ko5eF8l/KQnvgiNWNWYjvdVZ58aVlpHwXy6KRTUoeSU11u+DnjtA3k8scY2Y96ksIbMvJBHV+Dx7xxqi9tYowQ=; 24:ccR1H1Y9sXz2EA6b2dHVW8pltmiGLgpFi/7DLB+to21Xn/0vX2lRjqAne+Gc2vzVSteKLf3gNVYFY5FHhzmL40h8e2jpm1IKXRHaJj8NF4Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:E5dIOUY2mLf1vKAG5sa/ZVH9bMGMJRDmin93kgqlLfTlAaaZZYhdM1uoJlKQpkcZhee6UTdnIY/U2avYGqggVW+Oxj6uv3LayYrVoIQxCu/8nti3PkHlJ/TXyJGr+EEq/jzyMTkRfeH80hVUXUQeSsPPPys5NjwZqb7nJmBH4ffsdzZuuAdNtfMhW/QVoUP4xS5YGcb2xEo43g/iVSNo9pI2Yd+f7uzkalP+uboyrkAhlMzLTB4X9AQhrGUoyREN X-MS-Office365-Filtering-Correlation-Id: c5d82150-06a2-4d5b-4c06-08d5c75b5a33 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:30.4711 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c5d82150-06a2-4d5b-4c06-08d5c75b5a33 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_180246_143797_BA1130C0 X-CRM114-Status: GOOD ( 10.90 ) 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: 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 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 35 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 577b5ba..4e2814b 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -149,6 +149,53 @@ static void wpas_mesh_copy_groups(struct hostapd_data *bss, } +static 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) @@ -158,9 +205,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; @@ -294,38 +338,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); From patchwork Fri Jun 1 01:01:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923699 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="kIpLbyx3"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="uyqkWVlI"; 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 40xmMY3R9Rz9rvt for ; Fri, 1 Jun 2018 11:04:57 +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=KQUL3tbu8gRamM1uF72pPh6JdHX9Ls21tg87VCiPCts=; b=kIpLbyx3hA1AoK P3CseoNViFdydL3/5fl4E1Fu7farGXFBPgZpzpgN2FBaBkY4zg4xshpGnt9nN6ZfUACBbov8OUPkf CoWPDcvGQSdFebpxaBEp8WYFMm8rJOYlNe/1gNf7UzwJX2PZzDK8hlODioohxCONvwsRkaOp5ovjU AtvKVqX5DLn9gnfuwNBkg6YEi2eQDL2DpYqWYf5PA23tgNUTGrz/hs3bB2ounhdJy9bUe6B56mqgE vAGnDUodSQbQYXEF9OYkiKKEdW8JHKvkprhHvNX39vZ/RyXxVK1FGsoqlT1CKdmoS3oBlo0tU1Kbe ueOarfyuMZqco0QG3eIA==; 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 1fOYUr-0001Xu-2y; Fri, 01 Jun 2018 01:04:49 +0000 Received: from mail-eopbgr40056.outbound.protection.outlook.com ([40.107.4.56] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOYT6-0000R6-NI for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:03:14 +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=8D1wwRjnHXN+p52UjhfSuhilHnXDSiKuyI/BcxDR0uU=; b=uyqkWVlIctmJFpYF31cndK0Eij7jwQQadpW9W5hrfGKtycpl/+HQuqG3Oky/01M9eLm4RDh/ruQ0wQF9e5tsX5nf3h8cYF4UOxS1tvKDD222f3DvljOpJp889iyVTiZYiub/wZlvCAkrBBSeC83a7EI8mn+RrDsx6gCY+4AAiGU= 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:31 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 03/15] mesh: relocate RSN init function Date: Thu, 31 May 2018 18:01:57 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:XC95FJVaZQqnv6y7X6wa7vGUwoohVDXDFJjnZDjVti9uVZtAVkDAsDURVxDBpuXppvyYeTyINr/eroWZyk5EtVhQ1Elhx9vM1zyERoN+PCv381FRd1mPNSmRHIlXF0032djqCMPPYAbFquVmrTeyqJ2wxP5JyzxhIiaVXJLmFiscACXK9oMw2DdSWsjHtTzX0ZYYQhLRS3PcR426Tbbrao/l1dqmEAEH67t4aTE5VPE1KhnGlD7Wl54h54fIupI4; 25:1ZpDFC7oaCpuQwYqoagVpp7Jy2TaGukZQQ1IBYq42Lqa1lPNwMdQ8mRl7OQdaFpdHSWyQnOqp+6W1pbe649k1oxV1zo82l8ai54i5RQ4N4jUTZBhjoJbzL32OLv1epm12a6MTGK9z534+q52/77Eyk2C5b5op/G3/zvus2yWG9aSFRWaXdIT58yS4R10UtdWUVHA2QjK7z21Dzif6wTXc6R04FMq2yKV5QIEfNn+z0+4ilmWxigdOwZ2mdRGLx0ZKLQTlcucDUzsNMBk5R0w+Z8T0LguudSjd/sNtE5CKfphs2CIgTzzzQLz2JARaVN6GKJamcjn9JwkDFRqSh613g==; 31:pkKy+4/LJvSy5nBDmFkwGytCL86S/73yOotLZS4ETbIda4DBw6LV/ylQu9eXhkootfd7LZ9U54X1zcntJKYSi1J+t9mnjEEW9Apq32o3ETPEhunh7yHZFY7S3Jc3EwJroBvAnuhdA3rhk879XWnp+gqaruqeWONesVI0S+4YZz/lGb4mYYk8fej3NJJ/KHuq/m4Q9eF/HDmKIhNTPVuhlkfAJDPj/bT1GpxjSzxLFes= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:Z6nFl+gYFUeywd8IWwuM8wKnA+nFGUNZgy+rHBdhnSoAd9Ahe8H2FuyyqirfkV/qm7eAzEykXaVoJLzfpm4cmFIRNtAdrJCV7ixlvmXfmOuaJJOytdUu+DkzsMw1g6w292LnQqA/bkMDdV1PPeAQ6sPcCWff2HUYKHesT7Wl6ku0XB7QucRhV55CHWCDSRbS0+cxeX3j/YDNDVHyMV8EUmbkBvDSvrJ/uKYwEXCOf3dJptb3cf+RzpJjOX3RpP3rgYI9M81ex5DvgHRLfO/jjrVN5GuXwKOrGlO6Dj1d966hE7FlRPz/64LnTK3vk6Pa2SsgOVEqtoirt4zKuTqBey57FgzhW14d6a6QREM5QIfelKhUnN12lDhZorBPeQMug8fDIBQ8RKXP0TbEV+cw4ufqT/PaMewoAwlmyKc5ltQ=; 4:GtzOM2a8ZftEGxrcMpwYhtjj5p8fp1P85GD0M2K6RySp0SLD9IMca3/Dw6K1cQJMZPQ5At+o/F2KvuB/gCDh831Et8S3vUptlBi8dQoNZ4clGCZirigtZ2XdjIBDUvG7CULeMqhxKC0YitmEARR/XR/Oxf270uV4aD/wnmVj92ldcwqY/8VwSzbgoGe8KQO11RH/DF618R5exzRA0QE0IodlOKsxNShBdMtWsyYGAZyZwmMKjzGMBFphFq+PJ66p0W5GOYeSsT+nmG1kSnRZ6Q== X-Microsoft-Antispam-PRVS: 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)(3714002)(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:9P7mJ+QADlbEkcRb9vshn4JxDt9HsACTGKt54bfQj?= cOgqqU9uE0oAKXphwmVBTBbxk3Tg2bx/igUYTnJMgGyh4m7hAxPhHa7DnJ7K7ji7tf31lEhRtcfmsYypUbTyfdUWbDGHmqCCkyFQbxnQiwEoDPAvtlTNozYoG7i1Vq5Fqso1UJAt7sKdTOMPY4S1RX3L82GsmWCAylqpHqRhilJS4Yhamzq+oAn48h+eypz15k/NHl1EhwR9oeoh5EJ6oP/B4voXxQReKCtBl1j//5QmzRbftFTbkh0o5xOQ8u/OginMjHEyAoZs74zaAW2l1BaQxnrGjlprqycaNU8jaVeQPC6il9+nEINBPxxN6bq/iHONUGYe8wy4Y+l/Xji9T2naImMdotnJ6loqbvdh9uJdwXxOSYIUhhaAolYKDoY8rLR+AOTqVuI1uY4NpJ8KcAwWpEzCcfEOavtgkM9avH6QZYFjbR7dGRUVtSCU46lPhBjTK3rvb3hU8yV8+rxJI3BxRaGQcDcyi+nef8hignjKZxupVRv8PllpZ5eZhEZPZTmJQWxYyFOdsDAsgZnmr0Gl0BCokp9U/gfcteLxxlPrSsEJQKzIdOR6BZ+v+B6qBNrWRoCGO2nVPPeAtYnxAE5FL32YpSZPOMqKMUdvydwWR0py6TddYvhjiVzIiZhMYG2rPP+pWoDOakaGvyNhA62hAT4l+i/4WOlpVjSAys54qt8sAc7brbDiHncAVsIhc0plM1xd2YQdQj6o0DTtOjKpPkrv+PsOw9avXYopt5u+W9l8ecrvGlR86iwzeubwdKD9VD1ivVXx2+kF0ouBW21XqmU3i9gJEH9o3DHt9z4OiUWRJhA52ahyUSwCBg0i5dw2WwZbvepKsDXZFnQMsO6A/jD9/UGCjKb85BBLRlr+fhe8w1kS8tfwRYnTXsyp7UuE/QHaiABdgE2X/F64wMpLKO5DC35t0HtoA9x0Ax4p4i+4uA+deZNpCHPmWX5Qoso4yGFtBrm9wkfwbkMww3CO4Zj50rSAeT6MZxQeF25XihXndr/7qZRsriiOr5h1ZFP6Dik4/HG6SOH3pXdHnkvXaggTBTqF/HZrQzElaBHhhDjUGhSWokpTzBUSBAs1ZDeFCL33W8SMhYqYNW6NYlq90Y8uDlGU6yoZJ5RI8ZVIHMtPq+112yfcqmZP1obk+zdTMaaVshOrYMirb7PP8jws+6cGxSWScmkQHs9y/EDf1Frg5FD+ZiTjQG557u1MC27GIM0m6XjFxdK87l42nDtD697tMK8eUzCnpCqO4ViHEyshKx4FJMpdKp8/K0bZtulc/ASalU39tqvVVCvc/LPmW5+26feJdvTih2tOcieet34QGlc/+23qExZNiYAEPS+bd4bHHJDrdZ+2lEZAnb5 X-Microsoft-Antispam-Message-Info: uj1eC1myzpjiYrlT90eU1ALraO2OhxFRNlP5zQnKmAkVw+LFOlmEAshLcjqNV3OVSjRnFoGVklQhaTh37mLgCFxYpv8pI4OK75L/wKKMCUVDNkGQeESRBZ/52zIrk7cDdAWRrGKbugYh7nJ00kX3dgAFBYPUiIYPHiGVUmeHr6f5r0wd110gPeGzkHP9v1FJ X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:t2p2n4X1kFud2FYS3uavknKhBAY7YeyQKqCcxOkWNCFcy7Rcw7vzkt32lvfySSoO9A/Bcz+ibLBaewYZe30sjPzPSTjwcvC0r43qAyVBJ8DVo4EMQJZEIfyJA2MYi9BvYQEMJcFHJJ9od/BsitoqwHfQ0LmrHapDMes2Dx/BaKKBMdNgM5nGZdGY5fdnHIsyb7ur9oD1hK9F23aXDumvewn+4+zNgBp6sl31sD6IVH4RhULYqIG+ys0U/fg+JMa1csG2MC0eicMucruXh3b3OhhNzwsarI4PZfEXcEVBbdnE1O07XvFz85PyGXrNLU+4D8vGjNqI2Due4/4r1AvPgm8xPL/gT7GULvu6ML7wIaanGVinKOy/Y+kHbbpiFM8d8Lt7+Hjrw0YVk66mTyPbSEVyoUQxZVRV1hixjCVVGvWcekjGyTmUImSnnRzQ/Ze8y/SZpqCERkWbo45hECK6vg==; 5:lo4rbVCY8NLP1HtkspQ1CVe1Lx274Y775dJZbPoPSSpjH1fgxeGsMqJgndRMUZjlgQuPULRFbH5RWuSM0TZ/3NPvoShZB18c003D0W4SouMP2lf4tlpLWPBtmuZDhZH+bKVrgKBD3krh99RmGXmZsKPEeb7i4eWI8jp82tmi8DA=; 24:4JEL3j1DrAQIIgtOqJb7LOSC5Xosw5zKJPo+V3DgLh54mjGFxyNTS/iF+8ICSf5b1sDVYSRkX79rmubTY2z+W02B19QOLuGRBtU8GFbvntE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:s2PsWVosDqhtmKEfGdRRhQSYUuY4gtk0YjoxRA8daCvz+yR0TAkmV7J4Rk+gOQEO/x8OFsA2Pf1gEnv6gvIZPDwF7N8Lw48cx+6AgznZT5+2ncJXmae+A+lhxoBUHKCL1G+ia5ENzc0qIFwQc/b4U5sQjWjGSowfUrVPlPHKFaMAAZHWSU5VnZAGChEvrU2s8c/8UvFdY9QdLsbHk2uBS/oJuegXjYTXfxgcIwQ/Rxgoze4xyozTt6/0polPkn5f X-MS-Office365-Filtering-Correlation-Id: ed2e4701-c4a4-4c7b-938c-08d5c75b5afb X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:31.7993 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed2e4701-c4a4-4c7b-938c-08d5c75b5afb 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_180300_924119_9EDE710C X-CRM114-Status: GOOD ( 10.09 ) 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.56 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: 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 init function should work together with mesh join when it's used. Since mesh join could be called at different stage if DFS channel is used, relocate the function to mesh join. It is still the same call flows of mesh join before this changes if non-DFS channels are used, hence no side effect will occur. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 4e2814b..2358bc4 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -338,9 +338,6 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, return -1; } - if (wpas_mesh_init_rsn(wpa_s)) - goto out_free; - wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); return 0; @@ -386,6 +383,12 @@ void wpas_join_mesh(struct wpa_supplicant *wpa_s) struct wpa_ssid *ssid = wpa_s->current_ssid; int ret = 0; + if (wpas_mesh_init_rsn(wpa_s)) { + wpa_printf(MSG_ERROR, "Init RSN failed. Deinit mesh..."); + wpa_supplicant_mesh_deinit(wpa_s); + return; + } + 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; From patchwork Fri Jun 1 01:01:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923695 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="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 ; 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: References: 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: 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: 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 is the last function to be called during mesh join process, but it's been called a bit earlier than it's supposed to be, so that some mesh parameter values such as VHT capabilities not applied correct when mesh join is in process. Moreover current design of mesh join that is called directly after mesh initialization is not suitable for DFS channels to use, since mesh join process should be paused until DFS CAC is done and resumed once it's done. Using setup completion callback is how AP mode is using for DFS channels and mesh can use the same way. The callback will be called by hostapd_setup_interface_complete_sync. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 7 +++++-- wpa_supplicant/mesh.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) 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 From patchwork Fri Jun 1 01:01:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923697 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="fR1/PI1F"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="jJJ/WME8"; 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 40xmLm2MZJz9rvt for ; Fri, 1 Jun 2018 11:04:16 +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=T/YwNu612BVCQQvo2BVE5DhP/hgPPjULNf5s/VUpWeI=; b=fR1/PI1FhEZgkE f2p8Po3j78jOYJ2MXiPnXQZSqCBN2z3Yb42tLRcboIo6GWwHcNDg+Pz5lsdpu/2YIYdLO0p0HIxk6 dpEaYE1X+yPQZrmgE2o+jippp7UDEKi941Up28Mp4UxXdO+sGkuc6DidZZOwGGO/ZI2xKcpqLNAOU feANDqlK1hydTO32HW/2+pZXmGfu4dKDpqVUEK/nK48GHjiwQbld1xV91CieceWUPpMYV377ck6pI G/T2Mkx0qdghwR/IcyQ/BLtmJSjTf04k8/YODhsCZ7cEwLsBtoeJMMTaka4lEeNowmPd0gAaxcPrO aFHfg3BsiHSb7Nw7RIew==; 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 1fOYUB-0001Aj-PF; Fri, 01 Jun 2018 01:04:07 +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 1fOYSz-0000NK-Ix for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:03: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=UtDtsdBTggGFNw6DnnAYtSL+qj1BdKVBHNbVDmeMBpE=; b=jJJ/WME8pOB3N3YBI1iZ/IzZ4DUA12kJBglm+Ql9oCybmlMsRR3klpSypo6hRgmE62WBa+//erk14c7RK3emXqfHTClhIIH2OKniUmMqZogOqfLm/0WBzw4QPlUPiVG6fTC+W5bn7B2mJGqpLlv0ghFZvXWis1uvtrPuIWS0UcA= 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:34 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 05/15] mesh: reflect country setting to mesh configuration Date: Thu, 31 May 2018 18:01:59 -0700 Message-Id: <13ac70dd46b39d4825be6ddd1e86261407f3edad.1527814610.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: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:/Bkc1uuurBrfuqeesCWv8FIB/VTZzXynuviaOjAeV2hJUiVNlxxlv0GCRWpK1RknypHtvqN4rKfEjzb69OSKj/llmbE7s6Vgjl2gOu0MKdNNVo8gWwaYGnCyQLTWGPVU51zvB+gmPGGB1umwzuWa/q6EqPPXJ84g1sxQQR2hwmJ+6RdS7G/xBDZ7p+YvPLHrbFCjWZV/adJycqdBMNObTNBFKLCDvitwubFASfL6QY7lhvJPA6uDVTclWvE0qnnM; 25:gUlabS3mFuAqyQMYeJHcf4hXr9wwsXvxkcGpbGvGYNZ/kMq2w6y9a1Rp40UVHd24JjE7Oud3G049AHxLK95phE2UBZSbuCG2E/qP5e5y8CaGiiG6dgy+im2+ymZfR7gqQWxytiNdzh+WMgDLWxGUqN5tvLcXG4I4Id50ZfNCFgqBNCebnjvFFEtwWEmSMP06vrw0kmcj6ac0AtX9jzq7j0SmXU6E2RCK2T5X8DA+3TklDsin0fQBa/kJjmOmPTE03LibNoKSVUnn+BHtxxUXokJMFbwDqCZAiRXl0TncHtNAf+AFPMo/iWPUa7Lu7ioTvxYxslcPxyuC2uuwsiUvpw==; 31:jpmzS6xpqmqDZlbA0UFFm8A7IisuJeXfUNAJElOSOlhR6KL6wJGru/AYNy91Nb3YyoHa8rJk3Wn+aw87rQaPSTdPc+NE4+yZkjpFqfS+ZHfKqDB7RAyD1Ge0/0M4+xly3KyvvaG3RQqNinHdFGSsNS7HIuw9p1a2QBck93ocU5gm0V0Fi3uNQAj8zWVQ5RvMhdxfllvskgyXoAkMYA6MxnW3hgEpPU0meDC/qmfDyvw= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:z4CrAB/RDOCnznq+frHywL2068qwIsJqPgJLernEnjDWDcppWAIp4WRQUlgySVTO7i9UdG/F/SS7Ev6qwoMW7ELupfZr+H2Zk87GhXGwucEVKsxY1qx+hlL1RqJiR5lo04zZYi3Z0PiNmCJJe+jeC9nK4Ca02bj181T85TKiLVsvZS5GYhq2QkKRO132l4nbaFXH4DihKNdmFDnqyQDX6zM4xwscxy1MhduCPDdy2oAcwxs0nGEJm7QiB09ZjGr5C6Nm3mcws7Xp8P3G/icfBzVMpQgZQVWtYmjFzwwa9B575ZX4eIHs3i+syo5wI2sZ5RrjIts45xOzEUCg0K4nbPpD01s6ZeRyfd/Jp2tI+LqKLmME7w8nDe3tH63v5Zm/uvdqtcPasFFTMseQhJMMgkHS1hlZ/isVOc2kgGTehqI=; 4:bmnJ+hBXH83G9+xKaxH1u12m8mYrVLmjCA/M/qds+zuhxBoNgP8YZUeKLlBci8S1NX6+5TEl4Y0mirHYlgvL+AQ08a9BIYi0Stb4bpjwEYpYbN5FAPBCUL5lrVXaIo1Crt6Kv+vTug+PudHFskV/Ps40cVLyeq9+Yt34C1d6Q/0eFlMsmajz2JVcuvjS4swPOinDPO8wBkc4l+KdrU17bi3CtkTdWufEJoITHGFcnJYBD0cEAB3t4sxlhh0vbLSRRHoCnpOMU1yDYoz/NxQ3OQ== X-Microsoft-Antispam-PRVS: 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)(59450400001)(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:Fsff+VWSKcyIr7o276+qPUJ3qwne7Ls1rzy8oN7co?= OuwvYh63b7Zvhjto2z8hjAGyqlDxvPa2Xfv6tSMI2exGDjYx2LhkA+w6tZ8+1WKeIY9gTUw14QSqJJUWzQfe0knMxmaaviS7Lzxtf/rPHqHgHiJ7M/AXe2higREjF+Aa9xJE1wTBS+xFT5tRWiSDlOZk+CDVPGWZ2ozLORlBW90Su/+OVnPW/9G28kbld+gXLS6VV3gTU3xZGsVpBMFfw9cjWiDzB6LP8tzvufMmcfzxd3M7gVRy6QeDvd5V0Mc7qaxJy9eej8tvaw2akrGLemYVsp5KIp1bGoi4nGhF9YnVmR0ihgPh9sC3OfGRZe4gWw2doxzSGLZtky6TvOtrIVpAGozX4oL19Ku7Zr2y6BZMrUjPe15xOwJH3P8wavDxJi1BfsFZbW/4r+2T9moXCY3EBQxkzoTkKPC0i+LWZfGdQkzhVq3nmtly3cVbXD0sxEWPxFiEmOAHVCfwEQxilXDYShuJHrZuu4z1LuQ/+fcn48nUXVhKjj/j1A4odHcAD9Ob3TeNA5Ph2guAYIDMjUnThxAu1e04VVoPLT+8F9vSkasCkv1JxOU4O6IgYNTFzaEKXZA01nMbektLGckbt1qgM7q+8KtZKRBxTvfPyalj0pQUDnFr5VmO4SeDZNtTOb9fKjHtM9TdPu6wgWTuqtDu81HfCGD78O6mxjI8XSxk+bZJmpmkFFKH5XlbblsiZMMuxHaYui3XzwJ3840wTmia6pFGstxgWz9K7CbLas05CrSFfKL7GeD+WximMxXcYGHzqPArkQyGBFPQb5bgOdTP7vbFWtI6ihFJegYODFrwxmpUk+n9imSe/ieLQJmEo+9beBHJUIfIazxcvcf4Svn2Z18jRVV4S7ivIW4VdJiniaT2x/L7DZKnvkBPPOGdmnS0iJ0oEYdAdiLI8aQrAbum3u+BPbYGHkPsvIk8/fdyCrLN9Z/n90FZqvQ8PNX54K7d/JGC2gblgKqCdHNOZEj2QSgwkxgSdlqbGruPaduIH+hR830Vmfd7jGCcGhANBAbLOK6C5Qb2s+7tBLpE34SuXIsA2QYyjioqNNxKQPz4OK982UbNQzoJqTThmuKS6hfhVnBHArl5HdL+Wf80R6vMU7rwF3fh+u0tuHk/WilMsMbPQoWKy4cIaXhJor9UtAocmzY7aUkpAcQSYNET5KPOOwRHVibHMFFJts/rHZoLH0Se9he0ogyP4BPGXHnyXtr9cU+ZvuqINgJ4ZzNPI9o3tMdhot0QAjOabsnZX5TCuelVCw0Imd+CzG+d3ynlx1uCOx3SvqgwdiQYR8Te7fedWBpq2O4UQDnKDhX7H0DHl6xfraoY/0XdFBUaqWcGnG3b1YW8e7zGm9XCP/c+tGx X-Microsoft-Antispam-Message-Info: JlCT3ctMrpjpRfAd+utljsP7rVGompiOwLYJ84l4/rx6NnMuf+I5Iv390KvdXHMAmTMtZ27xMVIIZxuJbGvnnwoR46SwE7nK6QLbfhsEaE8zEbwEq47Pq8qyNYOSm0NgVheTwLqBU/yxdhRUwHJieGTNVpLbvbLDbfGUBjv1gn+hngNZx8pyHg42KOlJiC8k X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:p6ixIiuMFtz7KYQfhxbLnVlzm5Sm78PMS/MDcSvJS3d4Rh/3aN1wu8p9hojKMNT4LUZPqMDWyV2q8POxpxErEGWJucX66kjKszL79exygaGVo4fUTHgrHiYkCKQ+VkPqe064eTUDp4TkWcANLIwF57Gg1i+VSXP87tZwyG042mIC7oWIWpkKGWaYhQ8kU9LFZrDB2aWlG75XR8Lo11yDfJdpqopqeyn7Y+iOZ0gKvx38slytECdhDfpKLSUy7bQWLvMQcU22vr4LHDstU/Cp1PAyMKsJaWMkf61GnAVOYav/PQL0OKWQegRnA/lbEQY0mysBu0JedEYjShEwmtNE9BGH6P4x0TZ+ZSf7Xd5Xgl/km5SgLoURHcEVcMKVX79kzIDwzyY+L4EFFkIGjhRaVmOawvo+5xX+PqokdIS2FifKRIiI7esd35vDFVuVk3cETQx0ZzTvfhAlFRJ/IneR0A==; 5:o3z9VikBtut+SwvbagdGZmLiR65K3Qyk0F3GdL7Df6NnjEeFQi6Ziw1hXgr5EtDSz1+TIIyL6RDatgviDJJQPK/w1YlTVajF2en3htuRnyM+kTdPjMf+aQfx6slzDptA+E3CIbpAkUYM5rpwflo93dPAoGHsqidicI+YNjiJqRI=; 24:P4esPFJ6svjo10YmI0DMxWmkgTIsRn9JLCqh8qgL2on/HVQCFfBu0SF70hc4PQjb8SuxbZsfdE3i+PX5XpRYNem6EAf3bdb+HY/whH2XPJo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:e0BnzZ1QMLkRLk88gzLt+Wdc1enXNbLkLSXnRPwfmoqpDlK1E4HYCSfCXNtbWT98qe3WXnkI9xpNG/iZ/JqMVWhqJqU3PSkveH5exANLlnN94U3SLVvas4gDRaHqO724G+rGBejtU0EgQmt14jNKX+XzMzIzfmoELvqETpnf+gLAeQnxbY2fo8U93zEFYXaqPWGK9xRWVZf6ZziISVhi/ncxLD5n/ih86t9pubgWeVYL8fPEY9LIARAb6pPVVvv6 X-MS-Office365-Filtering-Correlation-Id: 84163086-b82a-4705-36d2-08d5c75b5c80 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:34.3307 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 84163086-b82a-4705-36d2-08d5c75b5c80 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_180253_647604_E4911E8C X-CRM114-Status: UNSURE ( 7.70 ) X-CRM114-Notice: Please train this message. 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: 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 wpa_supplicant configuration has country parameter that is supposed to be used in AP mode to indicate supporting 802.11h and 802.11d. Reflect this configuration to Mesh also since Mesh is required to support 802.11h and 802.11d to use DFS channels. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 868bfc6..91bfe4b 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -257,6 +257,15 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, bss->conf->start_disabled = 1; bss->conf->mesh = MESH_ENABLED; bss->conf->ap_max_inactivity = wpa_s->conf->mesh_max_inactivity; + + if (ieee80211_is_dfs(ssid->frequency, wpa_s->hw.modes, + wpa_s->hw.num_modes) && wpa_s->conf->country[0]) { + conf->ieee80211h = 1; + conf->ieee80211d = 1; + conf->country[0] = wpa_s->conf->country[0]; + conf->country[1] = wpa_s->conf->country[1]; + } + bss->iconf = conf; ifmsh->conf = conf; From patchwork Fri Jun 1 01:02:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923698 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="Mt1W24DG"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="BZaiQB6M"; 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 40xmMB0H2Lz9rvt for ; Fri, 1 Jun 2018 11:04: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=2fqmmciTTFYpMi8WFRwJB7i1lks8LpSc52YaTJA6fjY=; b=Mt1W24DGpSrb8c FuaeACGdoqWGiqLsqxsfcq8jlvc2cBM7wct+HuWPBd7HiDyayo81extZaIhXTKOuD7rTm4SbxQ593 ds5VZCNbZRseVcrHiUjmnC6LFKyFW06lpWHFu7egf2jFjfR/ebh2RDFd3W7MJEREe3jCWAFtDVoC+ ljdtVpc2ilkuuS6fFqXoySQ5RCGVEIt9vyEmudshwI2pzPduZl9B/cXmlmDqvarNUFjQt/R3UJQNe 1uejJR8bSdQILMtB6JwK/3YYbAfjESTzXNiro3FCnELhlsZJKu3U2d0KyhAonP1a1XFy6spQHgBAh CN1W23QTmn+ZCjSGUsjg==; 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 1fOYUW-0001Mn-SK; Fri, 01 Jun 2018 01:04:28 +0000 Received: from mail-eopbgr40083.outbound.protection.outlook.com ([40.107.4.83] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOYT6-0000PE-LY for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:03:13 +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=AsCRxzxpITLV5lCMi19o4zOumhmTAQnB2k0RvpMVI0Y=; b=BZaiQB6MzAWkju3jrD36ro+RyqJ5bLK1h6BC4VliOfCEdLsUqSTe4LwZooBDemR6lxC0EDYkJwyxBUIcnoUfuewLKv9QUo55sBDj0wu8IWFIpUh6F7W6PQU8zsl8+Cn+h2xT7+TS/UrHJzyzkZB1sg1/ZWJgIzhp0YKKXXXhTgo= 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:35 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 06/15] mesh: apply channel attributes before running Mesh Date: Thu, 31 May 2018 18:02:00 -0700 Message-Id: <6319e96f2dec2b46d05f324939d7d730da9d8d68.1527814610.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: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:n5H/ZdTd6Zgv0nrB5EwZz2fPKA29ui3z38vB1P4FDHt40k9h87bnACAbEndDkyrX+DFB39IzX7x5qWY32EyGfVr8BI6w9y2EttqIk21hqwoQ/lcshmY8IKmZLG2EjYlfKMZxcmDhbc11PAi+dCFZrDJOWVNGAeZTmFCzzrew8+Qirq4dOYUr5KqnjnDqVz1vd9mcc9e05fkE2uHtOnm7JKcn/dmHF4dSW4KYrmOnoyY6jfgefAFR+dxBQb6f1MMG; 25:F+7IUyztpvD7fp+EfiY7tzjnJPpK50Pkft8klw0sC7ZUj3kiF51IPgChimH275s7O1e7Ntk5B6O88HmT8kWfsUg1+5OUrFibFlzOc1es4hgSf/aEz612m6ql6aQyR82H1k9b3+eWhH+z+Don6EKpgHvo9a+RYpuyfi6a8hB6IT4ufI9VU2D4hKCNmPVk/gbITmCos41c7OhpGTqUMnhcoFAPtU1HINOc6qHPUnRjNhzHuOsqhLxA9jr/7byVpanQUxJquFJWQbrsS1ugLwIe3SfbfwA0Uwiap/40aDkyCfC7qd8JdxDHj8p7cKcq8/FeDcj5It/2axnok2wgWEYOGA==; 31:cH3OhiTG5c6QWGWDGUcTTWWNk2YO6p/2V2P+7zp/l20XFGBX6xa6Sbv/UcsmQojkn2uNisYTn4kYiDDcVo1eaTGEMMgr042xZSVc1u8gwIbkxfQyRzdmzUaQeXOlrDLNQe++vWNOuHMQUE4Xozvpku+X2cjVDMM62ZTRWYtY0fR8gnGAqlwFKo0khKCXDWm8KtgT6PMtA83v28/vjmt3C0BoHMoJKyhayrUhFUW9Eqo= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:rmt1S+hWYVyayyV5/z8G2Lx6sZshGGgpN/M11IRt6M3zO9N9S1TBvOZa2HFhvhWqsXKjPzv000j+Yinzg84VQSLEpTKM2oKU8BNjVQfKcR7zm7ajSiKqajmuMd7KNruuaAPptt7ZTqC6jU1k9BVNOTrt0wzafRFHwDVMcCDRTvxvd3Q1NCVzA5yUgM2eiUgz6KIWatgLLhM1UsQaQZjt6/hmpEQnSdwTnVlfhv9dEGjlHWFRtWnUnWMHnDu5RUrK8uOfySMSTl/nQgqWEg1avQjiGTJQcIin/AZaqMGLrBRG1tRAd8BeHVSLww0FTrdO4jcnb92rcc/Z6T4d9koRvvT/n6Rgg9vNID6PkhqWDJ/LC8if99DVC1qOe9uKsAp0pqyKfquveNC7Z/GPK24ToTiXqodMPBaXSR/CLSZHYKA=; 4:8CRk7/+J/g3FrK8tVPuxk5CARSoJ4SmQ0bZHAeQ6zSs3O5m2GGS5pEPNNl81CkpoxM5Mc4G769gVDLwjq7lphn9rWmnHBHspIo9+1TTx3tsaNzStIQuqYLkIYLeHsa0wer9MKMTYJCTaQie6bf3feUzlwFy0aR3F91M2+JfO+Os34XsGCeJ5LK7+MnjvMDiBCnygIly7WUF0YUu9JVf3TTu/GGzK1cmXG0yDXIJh/21QRKnd8qrsVN0Waln8usQjxgOsM0aq+wgb2tLxsNieZA== X-Microsoft-Antispam-PRVS: 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:KNDXqD3X8+6vY4x/kNzhwGqD3m+SzbhclYF8RiMsU?= Sy90tjxyi9lCrIDcfcUOKT9rYWC2acPvJ0+Wqrw2/olICX3DcOCc8aaPiw55VcRHzXaPKKDcs09WEcBsRHNvsBERDZq3cie2bu5ZXQENSYaSmqjMKlzVntGvBoqB86+XMa/Ox82J40kfxsG4Fh9lD4BdhJCZ93yZkABa4U0LAqgSSD6RxUicufjyV+eTmKpAnpwuuz46NpA4004xEwx+yLnz0q6bTdApfo7EIfodLOxOPM4BG8Gv3sfIVUK/GydL92GrNqLoshYsS7vKhG9LF4ACdbmpvnjChHxgE+qpOYm1CTrVD/iS72SylznrqeyhowtoZtlYX6Sn8tLSumTeniBbIYoO1ZKbonPHrK0n5LOverzjSlj4mzCsfwF+d+/1+ZtS40LZRmRss8Q4p/8soYpaU3/a7IY7/8FXu9hINDAJcwoMYWPBc1WWtt1v/epK/DVYstgz+SY7Sh0iEtVMWeiOjQU0SsAjirvs+Z0Pd0tE95lYhLovO7R9h6OMWs01ZeeMI/ENjUgtBDq1dv1NNKWRFMOPdJD4CZuYBsNAprIT0aS+Mg7Q31xgEnCW35Id/U+Fh9bpBroT2kF/6rgliomZKYr3+Y4rEADvdGK+3c8jUkjexpvDUk9MOlP0OYIdJ+WZHMUYodVHumjCNwO9MHFcrW+e0OyGi3Jd1Iv7vwu3GDYN5D35qcw+uXvWNU5z8JtRzBze7KvheoSht16lparwMydIwZpAgSJmZWiria9Saa0WZ8RtPXldEPEosF0oyOs9OW9BGhJDVDjGVt55tWD8f1g+wGHGulkrWNXc9ZSIexUrBwtNGihcAgKjAc4iDcT6X3kOn6ZEL3BxcDjIUvi1qX3FxZbJPaWzmLb7qqZw3X6iiC/woIXKdhnqal1Q68QCMP5Wj78iOAqg7s0QC5tXwQyTR/8EDQ6tDGOnx46+dWZ3guCwlmuVbeLcxa120nxGplAAUAzL2/YkIs2GxcTyeDOJacKIDcYg9rs249ME4uX0chqrpYjzWDFLbSrBYI/drtyUqSdV/Abk4Rrt0dCKY7wEDUGll1xvKmMr+FlXaTtNY4BhUM091XgLR0WJQbcRbopS5rDaL6Y7bw7CBSCapZFPd/umRTl3H9tR89wCAe41OE3UBEDssCfm/UoL94QYys601MG6RzvUrVZjJFpjrtwsOGoDvQOfTv2sMxglae3pPiR3KJAYozR6d1+YUSwMnj8x9ni1ljHinWo7520oE1sIJWEWEAApoQKjlDNKr4+HFcCBQgMtZk0H+PoXxYkPAIKFSHt6cO0518lBwCAQkGww6JYO2/jD7L5LTk3Ozfl/IJu1+pxv6Q4t91nlLY= X-Microsoft-Antispam-Message-Info: RvJ6n/4nJ33gI/mn8W6KwKfozzRC5LzwEE9ML3V4LCgTS23U9tgWnoDZuTMVSEHz62vRJjmWh3MfRsrSl6z1Ja5UG50tBUwV7WLnUIS8STh9v3AZx7c/R96BUbksmjoJw4RovrWjso5O+SmFGVorMjVGYuRvu4Gkuc4qjzbIcP/oXWUQUAsJzykl9Tai9LcF X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:MIa0r6Z3SQ1vL4octOIHke6fRFg3TOYLJQOseHMlUY17VxxqSCR0Mf2qflkCzqOeHH6G1Y8pDv5Hzc4WfTrkg73jAOB9mDDpObEiOlJI1LJAzg20Ue6gaf3O9UVxKth7RvrOn3BXRSYWBZO3sK5IbcUbP6BP1ye9s3ft+3Py9geOzyTuJ6dA8RFE6vvAi+g7zwLh7Ukt0sIjredCjPgo9xncrWLhTZAFPJP6TV+isib+Gi2FwVkA5tl2PTkWTOpAC7Mqn6rKAGNWdY6s2SBENjocozuxnUyV/4vbjqfAlI1c8aMokxYBCFW9Iu1oHs219D4pgJIOlYZr752VF6dazrNyINRqgKdvAU/gP0Gd/fwDlgM4w//UQueQDDYu5hFchQ4OgS6U07SRt8n1+0alWlOjL25dscWR9NVOFQhktdBpszYYAZpZWjozdoVkhPpoQx/CuP0uwPn10UHc2XQMxA==; 5:8CUU+paRf2gK87lJkO2C5BGG4++XdNsMC66LgSyTGxmY1Elp6UZ/QbNUrEYCBlm20JR7idVb/mUWIux3QxsZvfO4GDSlvZau7bTTZvmrK4UpIKElxaw2W1qumQfYeAKUfKBhYzvh8fzXIbdywzYhqJaQ5rE6aCZCr0QoVUXSow0=; 24:TmPBkvNF6rFZtrjZ/WMWt9cKbveo79dO/e/PxJ1PiZLg3Li7Hwv/trFx91ZF9stU+OFzHIj4HMNxfbByzRBJEPXt4EwVt2AGtzbzal2WfQA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:hDK8q8mIe/XctBxJ3JT3Ik/RFhZtpF3D6qGC3Ba8hYppRYh7i/TZxAe4LwtKHOyRGyJXG0GTAMmmtE9DEH+rt0kjDWz9LO0aqS8ax0fva75bgt98JE72nZFeRNQar4IU4ZNiQ7jLHD1VnpIQEZS73MLRnTDx0uPMzoun/HlyyF2qMXQX0Y8LBs3CP5Fxp9wsdvlHytdfEOZbWXGefq1yn5GviKStppZW+P+3kT631J2vqui05eq/xFJm4Tmx1SBR X-MS-Office365-Filtering-Correlation-Id: 99262b70-7323-4b8b-6a3b-08d5c75b5d54 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:35.6901 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 99262b70-7323-4b8b-6a3b-08d5c75b5d54 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_180300_750014_307E0D2C X-CRM114-Status: UNSURE ( 8.44 ) X-CRM114-Notice: Please train this message. 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.83 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: 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 This helps mesh interface initializes with correct channel parameters. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 91bfe4b..7373d1d 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -339,6 +339,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, conf->basic_rates[rate_len] = -1; } + wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); + if (hostapd_setup_interface(ifmsh)) { wpa_printf(MSG_ERROR, "Failed to initialize hostapd interface for mesh"); @@ -350,8 +352,6 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, return -1; } - wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); - return 0; out_free: wpa_supplicant_mesh_deinit(wpa_s); From patchwork Fri Jun 1 01:02:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923700 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="j8xifA+N"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="mOJ3xOpO"; 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 40xmMy4wpSz9rxs for ; Fri, 1 Jun 2018 11:05:18 +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=Uh3vVfcstAby1iUkBkYukaJtGA4pfOorVnIMK5bDB4Q=; b=j8xifA+NpLy9Vi lsiFU3Ik+Iuv/309TAIo7kWzaozi9j3pHYZXYncBVnpsR5ZXCHjJUzWqcbN5kwp6BahSJAiZ79jLH M556wwCab6GqTOC8icduGNWcTR05yOTR3RfZa+rvXBAbbtF8bfWjJs0l7m6nW4OHFWgvvVCY/zzGl HppnEakscNJLv/8bS3aicsGvgQeSgmSros5DIT6yVAO42oV61jyltbwmQWml/u/nH/NshPBuFKljL 96fN7FQlcivRFaNCOKB63hwwVdDBGbwf80hNoq5cybLUt9eg6hjZlXAbU/f54bt6KBpPh8iJKYD/j KRQREFZ83R6mg7lD9g6Q==; 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 1fOYVA-0001xF-6E; Fri, 01 Jun 2018 01:05:08 +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 1fOYTC-0000NK-GC for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:03:18 +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=kYqXm/BeQNFTTdxnzjn1RN4glyilyTClD56KTuy9pMU=; b=mOJ3xOpOxfCgoEuTZbE3xA4nee8ikAxZp+xWzZEnCy1/TkLZjsckF3ns0B8NqIMOm6IfPFqd36QIz6lpUkuCawPiQsywjOK2rTboRnlGlb5LnuCICcdIwk0R2CIlS0vF20Z1/trKLIzoGkRLpxMNM6vR9xUE9ne0WTzGfjTaups= 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:37 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 07/15] mesh: set interface type to mesh before setting interface Date: Thu, 31 May 2018 18:02:01 -0700 Message-Id: <8982cbc924912bbf4e147d622d6ac0d259c5f69a.1527814610.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: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:XcJMO9Y2Msv9ULV2AQk7Dr9nmPozCT9juLmGv076RS5wQBBeatmTDQ5LsChYZ+CTT0nTk+wi4HVKheIu9KOOuHElOlU/SJpxP1xoU3PC8Tm9ewvC59ydzJHCNVL9QTZiimp8WHV80uVs6MR07CAE/JzLIekXHuWhQfhnkA12do+h0m5QVetgt+mzo8uxKRBPeoCY0MeLjI3hahhh7imxGLIghu8oyy22MaA3pEpxZp5wZUDRB7mx6bgpUWjEvIUy; 25:/7Xc6lSYk1+aHCQt9TG4U7qW9vAJtuRxm5QJTKeCRJ3aWTjPAl6Nd1zCn25Z4ZtyAN4vsNBb0BQdTcg0GJcUABh1ZHDoeh+J1c29wMxX/HTmDeJ9x3v9fZ+EAyYVEJf/pHEubSveYr/5ioxk9+33ue5z26iLkWjd3QCODMbNSUPLfkde4yl3iB6RUgLnLMO/LOYqItBBcKaJLb7aamhqTgMjn4FPYMEnpXjKOL6wRS21I8oRcUrrwj1vW4JLF9w+PtzHoyQDgzzXq8NAwevj7aCQGWI2PIWqlbpCyhh0LKUFPBn6SYCXq8p/Tg0DgEwwBrGifcxF4V6zS5wSDLIp/g==; 31:3WD2tdFOD/JRLYbkl1bBX3Tj7Cgvovt+7fXewdw7Ao8o5uIuqzOnByqeraVknIgVaAoL3MeTeKcd5h9aOnnanYiUZcFjXu1C2IZK0yl73+AbSryOZyt5hcQ8m8HkCvk5EyAAHWp0Ok/IPZJuv/m5U0ZxZAG/lwOnPeYKHIPCVc6VjN8JAuLZHtGlK7R1lsmtQlbyz85be58o7tbNgyti2ZpogXQOfuoipUCjKB3Vp/s= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:RFd5KZVVrLtGenWVr9ojizvCb87F9PiMqcy8+ZTsyaDhanwySWstKdr7ekC0RoGH5p/H2/JkU5YBHaKKL8g1b+lvXdz6EkYReYkLpx+3aQZY7u8mH1htbG8wDVVqjbUfcRVMT+X2cgZQIMCfOeSZA0flgwBYnzDdv5/IPozUV+6CibK4rP6IcAOKC1Y7pzTh0hPJSean+4BtIHUasEA7SJqb/FDouRhcOsY4+X6wGHlp/McYUbULcdiBZo6PZ7jJcXUG15+orIIHJRPNn3Xwn7Xm8ZkSbKxyihnFA5cGc/Tz3BJmtRlIhY8F6awGUPF/2eYDPLltV3u8y4VfsPgRORIszZVoDRX5b6cy/AcwNOpGBkmRZj91oleEAJUnnjMa/W4mmnX4IcVXqRxcKpD4gEp9wNF/UJOY3MKYe+uzJKw=; 4:AbGia2gJe72dl+9unOPONHnPzp6lA/TTOIK8MuZSrpM6ZQWIUy4ZXlgGk9LkRLSb3koWraWi2TnkKHtXJzPlSgJAMSN10ScS2wHHeICPgLUDtMyg2ctie5fC4BHiiuObqK3SxTKIlbitVvJLRiKsz3Bf43KTbyP9aMIbc4TDNnRj/t4dECjMiHExrSWhTxrtwKz2fDaiI6ZftJ+aamvqTnScDC5WIOLlfCohIMuvTmNEaBzPvcnozciHcOpeHm1CrJrzLYbe3wWBBY2A7jnrMA== X-Microsoft-Antispam-PRVS: 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)(979002)(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)(969003)(989001)(999001)(1009001)(1019001); 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:a0SWvPqZp9xo85pwNb2DgSa2od+2gLedkwirF7VNN?= 9qmrZz9kHPcvlTbOrUUiyuwcNIzFVMuNEUwMQp5CvBo/WR2LUGj30MKUETqOptL0+4KXvdkjhQORhysmM30xlA5o04UyE138fOyirDed1cjoDz7dC08liC+HdDodM4eMZ45GFYwYShV6kmv1GL5GuK8HMBxqjh1h1ESlOkqOY2ZlHJjpo4P7aOoNVRiIyi4nbY4Z71hDVBh+PGdEFcPYQUXoYt+NIBglHCmW4Z8cFKLd7GegInHauyYuF6muWabr3HndG4TEUWaz99n60Re0c9xHo1rZD2amdK8qvCX3jNQLfEwgKCbDA/NMg+RtphiznarmaDeb8UrWSRlkK/uL1u/xiEzvdeVVAi5DoS6mawikRlx3ZiptoPdJW409LjTXd0DfrbSBlSy3g/x87RA7iUFCFWRCZqYEK7Eh4egirUEMxEmVYMArEtB9qOAGPJcpghJIDozOl3yvsKaMQTy3pwK2cdQ9tp5egv9S8HY+0PAwnaR89nHlQMzDZZATgMFEGuGWv5tMApt+F8N19geKqwt+2WsHyyCshsPInF4oJFLBGvycCQr211s44FZnTt+yHhYLFOR0VB0u57CmqQA7i7vtwdv0X9XPB7kBdQ0oYPeV6wYWBIvi0vsDJLWDSSWDSofQOdUpL8WkRIMooUubZN/lZ6BSGWdsRV1gtOGEbaTAQTZQp7WqMaTrWBZYQff6SEphkxxEJzojOS2tE7QGwKzhKwthH7BchIgiCVzPukt5m0lbzFP9bH8C/aMK0gsnQz6GIeBf8OryyWWD4WsyNLvbD8bCGNX/IMUIA5cRTYTPo11JaVWXE8941lnmZtr2dT3G+9O8b3ubNVf9MOCrrMOJN3dvgAGMlw7KHh6ula+KUqLPJbJvtzfxfq144mDQcu1i6fVxx75LtIE1v9h+0x93b0nlLnszQ5WDKKoToq2bN/5nCVCbYykI2993gBROynQXQzYQAJOnv0s0SYt+rR1gvuNArQlGTPc2pI0LQIeb+dgxSFXqnaq859RrFhiyDBCGZbb6uq3e9J664SfVFSbhJJ4SV2DW3Y9zcNxGHQC0c+MDlLS7QNJLGSXue00ObgzD0qZ+fsNjnDPPwzslhbUokA/WeQWqKvTSCKDDYyTB7bGOYy65vHuPSM5CHaCfIN7QLNisoGafACL999bDQJ9Quj6AP5fMUXB2pVPHuVIQ7vYqJXs797Ttb4Nm4UY1/Z7BVey8CaEla2bD2eY/LwhfMwsy6+zTSNPENLnMb3VGcADhQy6ox8N1vst4/3nNcPrK0eWzUo+KbSBgTPYpcY0qE0CstdxWRJHKeo89RzZiJK4yso3IATRA9jpnbamfNP3txhh8ad4tEkmM2obkbHaIRoiMH8ntBU6yTlXTcKd1b7qAdnlKMvjsTWOOakSeR2CI3F5ezrRhfLZUEZy5HVr X-Microsoft-Antispam-Message-Info: pgD/SOBSkYlNcNzERK2ozVyreJJ6VkK7nezdHM25/5aP0FaXVPpcocnKiDb4G1zCMA1OhlW/C/x8d7FwyaNF++CAaQoBCA5CkdgN7+zWPiDYPwGWBs7yVr4od/1enJdK12BLvM0xs/3+YxdLk1hojL32crvSJkBzXbSKKx8ZjPN9kJpra5Ly1LQ8EG1DgsB7 X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:Sb0m8lkBod5ZjlSFdr8XPeIeJ4gqe7in4k38PJGiVnN7In3c3g2wGjFunLoonGFcxa21NXcp1LSwbvmRih/SdOsFE+VNDe/A52a2ww4D9okDMJIayXPZ0HXh9MLoFg0CioAI0tX5FD4elGbda2yyImEpd4iHawCWvgRdgQQy4WDQOswXQ0s3ogWqDS8XBWYOsv7lVrzb5cN3dRWxt/velQNNDFzZCCpJGlzcTiiT8Y0MW283z56FThxk4bFXbX6xdPAJczLOcsvM0HtKaGdDon50cqgyTY2JwLkuJpJBNh5Pu1hSStZB/5V7yM3YryStSIG13TBt7lA43ui29jpcfUHSXASxXRqyvGYuR4AeLuQD5EPMwwg83Ct2kgVSFWKecavhln4yFnVc27MlYi6zjIQYEXaMG4Srb7S7uMymr9hbJLnrlEe4zRTglL1bX0zKIN9DIjekwu3RQXYXGGosEQ==; 5:7I6QYF/FpQDPiTN2GYtk12foFEMo1Qow/tMS7wPYLBFhYexSqCX7F5L4EsKQu1CD6XQBxoV6IFa35EuMdVS/hUWknCyMoIuQmucI109EM6MjQhaMdtSZVA1Bz6SJ5LjHsXP4gRNi7J6CIKdXc1Wm7p2UTm6zoivCyL+1huVwMQM=; 24:UUrJ4vhFgS3ubL6+qZ3KlwYcw074m7LNDg7KswOESyFVErF5hPVcRR5T9WDg3e/thHAcgqt0FnXtT0fvgBN2zDU4KoVqwcoQH+p/jjrab6g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:y4KzKEjL1JqY+gACgC6VkewinMcnPppjONLmrxB+sZETz14OnH6jRf4yePsBRY+QbsSajW4Tm3ekGagP4XgI5iMk7l0bTbL7amMtn08ZtiQimtvsGwSCpUOhnpSrcT3P/cxso/C7zFUf/KES0Yu6fMcL15Oq01CyofnGxPyQcj9wNMniaqcBUUgBaV/sZDEH+22Jzos4yIFFkcexMfyyfRhafhNJEg9J3YSQdFGTfTJ9i0HWXWjh0MVohl5BrSik X-MS-Office365-Filtering-Correlation-Id: be98ae95-018d-4cc2-d8e4-08d5c75b5e23 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:37.0808 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: be98ae95-018d-4cc2-d8e4-08d5c75b5e23 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_180306_603621_AC69FF9D X-CRM114-Status: UNSURE ( 8.43 ) X-CRM114-Notice: Please train this message. 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: 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 Correct interface type is required to start DFS CAC that can be triggered during interface setup. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 7373d1d..e99eb7b 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -341,17 +341,17 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); - if (hostapd_setup_interface(ifmsh)) { - wpa_printf(MSG_ERROR, - "Failed to initialize hostapd interface for mesh"); - return -1; - } - if (wpa_drv_init_mesh(wpa_s)) { wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh in driver"); return -1; } + if (hostapd_setup_interface(ifmsh)) { + wpa_printf(MSG_ERROR, + "Failed to initialize hostapd interface for mesh"); + return -1; + } + return 0; out_free: wpa_supplicant_mesh_deinit(wpa_s); From patchwork Fri Jun 1 01:02:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923701 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="lfRnnMhi"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="UMbA8YMv"; 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 40xmNQ1TH7z9rvt for ; Fri, 1 Jun 2018 11:05: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=+SQcO3rV6Edzex8FeicI4ZktQqyKZX/OCWfTc1TS3hk=; b=lfRnnMhidebAvs INxQquH85RTBNaxW7csNhKJxkvI7qHe9m9uYEzvLTzpKnVr1i7av7vygsZYj63tQgPn9X6cvNKHvj JP1y4jUHJ+E4O0vNRoniJz+II7IJFn/9MXJ+Tf/ThQgSM7pv0KN77BRYzhndBnBSDLAbOr8SHt6mp V7SZG0Cu3vSUVNQkzCqe8oQ7f12zrIPPWe//4dZvOJDyA0O+0EVTu4q5oHjbDX6baKXH25cIZWgO6 gPDNr56vCzisT9gl/C//ol0NL2Oy1Tf8EndA3NzSqiUD3JuVOl1Hx9CV4rRNXa04KzSsuoxicWZLm IJViJjU1MZoTTW2/bv4g==; 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 1fOYVW-000321-Mj; Fri, 01 Jun 2018 01:05:30 +0000 Received: from mail-eopbgr40083.outbound.protection.outlook.com ([40.107.4.83] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOYTJ-0000PE-Fo for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:03:22 +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=9i8/FMvj/xfghrOOIp2ZM4MX87ZocI/dvE3o7w2sEFU=; b=UMbA8YMvEXCqo7pwWexdSWDQlC44yiF1BDX2YXSllqcURzt/rIzg51byaqGeXCM43BSb5d34KBilXQr6qW+uQNm4MnMQZ0Jm1srVuUHG5mEaLzjGsFzF8Fw4M3sclNo3njb7uNCeQuPyukjl6ASPstnAZMqTyjLZX/9qwhHpiPE= 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:38 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 08/15] mesh: set mesh center frequency Date: Thu, 31 May 2018 18:02:02 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:4ce6xQeyenZzXhQBSRup0QZoXw3DQKnonl2n5kFOFzz9peWjDONubiAv33zYQT4wl8sUbekVFYBXFL5ki0N76Vbse6Fx0QSyIVimI9xdy3EhHxOQXDDA+Dj8k+Ed7g22nt+8cbYUoQ1OF3e4Bh3eipkTkMT8bkgGPreWpLfKVJ0UwPVkA27wWaQiUz6O5p0fdBwWZso5IARRbjhM0uD1Uvrtc99qL1EpOeTTpBEQaMunwzwrBXeTFW0ZbixKY9fY; 25:8gxda96eXQqV4O3S+xNr1rnKEhO57I/fj3lLotb8Hkms2mBxCU/Tl6JUGUeToAucd+qp1MEV1d28TyKaGMaGZHe6Vvo0/6o2xGF6wzAU0Vk1Ng9lOQJYyTkis/V1CC00PmccyJiOaxJjJp7aRDANeeTzUyVIn/Lgym++1JXLoQXEkd7HrMWXnpH6vvtEC7VAW+vcx5e8t1jxdEwz76dj7a79uBR8snXMuqgdTKaQt/LfQbZhf0HHSTHXCwyyZ3Aq38sixaLqFfivNdQgtgH556ddQyF2X9GcpNoRE8sJp3x9kmh+3SuiER4ch0aJTG3ic7VcR9wFwfNX7Ko0KqjgZw==; 31:f3JlEIrjeNs5T5QACQqychpziGdGXTGKb2WHk4FxfJb76Msfl70XVdkD+/apuRH//taUSgeQWfJPrREwVm5xDunl5Q5+w9tWKGXN4Ug+GrJuLbwb44RjIYr+VlcrwMgTjHSbxd8hnTrEuuzh3bwQS7glzx+z0rRXBG98l4BOxa7czfSiF3qjQUv2c7Tbt8mc6WulGJq9V6N+GKDhiTW+Rk72imRkiSUsdVd5MCqg7BE= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:HNTdC8ZvJC0/PCCM5bZSIb7Tj+2kK8oIgRclbiqojdpQlB5KxTNSR0RuKJSweo/mmXiqB3o82vYLgEw/jUoiXBwrXWnKAkBr7gQyzUqprhs/t5jefMJJphOULU7myZ2Y6gvRnUhfeybdqY/1s1GLgq6CgrFG+jFkDEF/d9FfhjZiTrnOBva23SCdJan5laBljolRgC2kCdiqY5xTva1RTVNUauqN1A8Bj1i+Z1c+g23fTx1bFIA/csaYA6FFEXuus7QweFO3KWD8kq80egCkMKk2xrLd7jLW5MvHVk3lRTcl0AaVnvhITB5XCYGunEOR3TTBEhsXSo8gJcN1e33LLZ2shirwuurIFW8lQjSrZljHMrwC0Y52DKExZhGrkeLuGvSDFHqiw1dtmmkFmne3/e4mOL8lHENOHe7bVV6PDIM=; 4:4k0uei2lwwqm1Pvt59dtsOSBiWO/4sTDXbZyC+4vilFR8yKIOkfw80mZCC+6Tg0gka+KSB6fNK88+whvXAzQHtOuGGg44ZwWhU81x97xP3XifpdiMVQL/OFLdZ6YDQkIAIpb3kGxSdKaUuUrAnMFebH4MhuNBKyeOEsqESXpHVkGqh3jJTyUdCg/JgmXnNXadkgmQJP3OXh9/Q+twT/toCm4TBRTLswoUtXEBDsOX+vrilr2qhJSYYhWLZhT5dtwQ1/PB1iHD+7ODmxuf2pFDw== X-Microsoft-Antispam-PRVS: 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:qXsPbk009AzNrPuhPp8yvQl6sYvcEarud4qj+5HTX?= v2aIZLjjOtQgxQ0+HtjBZXn/NMNK6Rmlo4wjEqA62jbblGjPp9yNLunha3OUg8aTvkax5uWeBYkMBXsRS7amKO9FlLq56mZjjdX62w6tri5LsR7VcOuwg3AD15BWX5LdvvXbHXMjyC7uz+Q8eUsshD6j0baxGcYTMokVShgxmZfgsMWOCo2g8MhLVKTh2y3je600mGjXjQNeseAUV2gEqZJhOWhL5ZDhhvbdngM7ubQHtRMnJNHReAl6Wi3zldV9FMZdosrsu7XKDJ0uQA5E0j0yyx7PlE03sk48/ts5DEhvNZ55gB4mXXQPqNsIRuqTrSZDPp8PNLXLVZRaOHzVkQLeSsZxntpjRhUrZihkrbbokSbWoitvhf+SDgZLT27EbFL5fQK5EkXyTsve2qZHFUHvwBO6rva4w0o8i7i7g+OnK1y41HDv/GAncYfkGcgGo84JW+2m3nTKuXZn/PhQT1Mj6D/Qtso2TJvh9q3RL8S1Pvsfx02R5RlJcRaJnJEkxzRdcaNOvrUvl1aF/pRbN6oiJTDpM2F3DPG4BE3F5snuowvylnym5Ult+Y0FKHPpjiTURMb1aSZ2o7dwU3o8qsGJQa9WMwuzlK9cS/kFwi4E7Qhd/NNUHPc649mbwEiHIFN7n3w78zi6dv72SzO7U9JKR5ZKL4TT988q5jkH874Mm0vncuaTsSGagdmIHYyCMyAsaFGMxf3XL3auibfHM/0T0zeb2Mepc+Z+G9ktrUc6ViyKdU8Dy+j4W/6oQyPq3vjFgLi161yg6+RToBRfk0QpJzghEWxXsXn/u3jEVDB+ykeT5bJHC2NNWs6YSYF/3DU30pICgZpJRUjzwa8yfIW8s5vG1czc0JHLOfraa9Me0IdDYIyDD9gWnkvcpEIJB98gHilUzqxZQH1gr9ysiEIP66AEpxia9boJmkJwLFsKSoaItgAf7XyreP4eyzFMBH0PiZ2tySrfohR2CWl1BIOzoOQ2EwxzZ2+zN85kwdldaUs1Hco5UZJYwSKAISes1wMl+tuKv0jButZi4zJBExQGUszELn15n5ELecvsVBz6zbkChHNvcSy91nhCxge4vv+Le6pEWdH/iUG7xFes3LOJ1hrnW4h7NqX2nTARHmnHiX68ttMneTlLVaZicYFpilTlPtAeiWGfeQoiwzLCoTdAoxs1QvT40jA7beKwNBNnFsXVwVRqCNew8om6HKsxa60f3aTW6nNjXFOJB0wriX1bZK8Kn+wPoHuaByPV6rUqeeIhKtg5zzAVJEeTSQbsiX67J5uAVs+FsB4FKJqyLGrMEutTKx8RftRngyWlOSYQNxwsVqrZ2BLadi3wFNnTEg= X-Microsoft-Antispam-Message-Info: gtIrXnhzf0s4ni/qS5lPhcgHh1qn6bPbhsxb6F1dR2ZrBNR80TKe3WzVtU/jg941/DWEmyEo0S7s11a38JJFWZep07hATQizXx1XFh0+0l3Z8am8HgpTliHdG+Wd5rrQlMbw+CMPnGRoYcmIndbx5aQ8FWfodG5uYqtpx/G3IKZ9+tp/cu3JA4c9cjZykoxq X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:eyOYl1Mov6tzUbFtAzcs5euDjdfXI4o7Pea6VK79zw11Iw+ultxpcoaordkh/waZzEwpLT/fidx9bHjxL6gIf03BZq844QeqDHy94yMRdFH4jXcclHrxDEbZqNmN4gooX9mE38nE+rxcT7ZFhYLu3xQ487cwMtjvVTCM2bC+C+As0K/jAzd9kwWmEFaelkXACvo2qpK/oLxrIHotT5qlJgTklxuTPvVzu2wMwXzdfh0pqLhwBrrdPEIe6M2GlKqF9A20dm50FU9hgK87Y7BXTk42n6JzpscNYIvJjkFqw9kNDY/DMOINZ74OcstBJACOO/RSd+wQdM5bQpOcBpJYlmhPIaq1RGJMHdVwL7TTt+FhliiP3pXW24ypP+lGP1IPkeu0vHuj0aY4Zx2q7HrJpSEwZHF5+lFNi4DOqWMeDFxxPaMRZe/iLGyH+9LplBAzODIB2P02M+VLCpPRzJL2DA==; 5:KPtcQBllOaLjL1iyYjhKCEj3xYZiQ5wJfzZ05QzjBs8Zyf6cS/3DfR1Ayn66oPNrmNGEYHCEuy/KhygyGQjTHsobBfzXdlA8Dz2S90jRaN4kfWG8Q9oMVpTvjCPZ06wb/MZEriRd7VPaovrAObvSAPd143fEC2VwL+jnqP0eulw=; 24:3aU383iWuJVHpAb8V94UnAMIfID7+JS4vYFQhkzALYTGaB/6oMnZuA7/PVcbeyc8hkLlqdfP+2nzZDf7tAk1j0ExrDEZkeA0x2+Z0GZT+nk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:3jOwRHMOh/QtOT/2MaR8tBaw72AnfFSCL083FbRwhywlPv1gzeaFwSNhHS2XLznxpjpecHMtJviNxFt8C/s6xkNIAwF+Y4MpwzlNw3dfPUtudVZ6uztxiyhB2YdnzLB8RM35ghYpp77n+hC3rTwlVzzufRlwiwD5eP3ni/PvQLzGq94KFlQLzurvoXiMMWJsMZ6LlUpLKaLgTs9vZAUt9TWg/DoL6oqeCJYZfuNBYH2ckc9UbOE8ZK5O/cSLGLWo X-MS-Office365-Filtering-Correlation-Id: 1f996504-716b-495f-e536-08d5c75b5ef0 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:38.4246 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1f996504-716b-495f-e536-08d5c75b5ef0 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_180313_612689_9BD4E725 X-CRM114-Status: UNSURE ( 7.29 ) X-CRM114-Notice: Please train this message. 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.83 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: 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 vht center frequency value is required to compose the correct channel info. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 1 + 1 file changed, 1 insertion(+) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index e99eb7b..c73990d 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -459,6 +459,7 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, if (wpa_s->mesh_vht_enabled) { ssid->vht = 1; + ssid->vht_center_freq1 = params->freq.center_freq1; switch (params->freq.bandwidth) { case 80: if (params->freq.center_freq2) { From patchwork Fri Jun 1 01:02:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923702 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="byCz/2aD"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="rpkzS5Sc"; 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 40xmNg6gHHz9rvt for ; Fri, 1 Jun 2018 11:05:55 +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=RO8bQ7WWsalFRa/iZ1iD/1s9B4fklCG0xGn1DtuKyEs=; b=byCz/2aDTNKnbZ rDmr4Ry62s5uzHkGH2hfdzUKWzm2YXUBfSvOJ7ZRt439dEy0IPmAQfBOICKQipoLaE2iOhcj1bY7n h2Rf9hw7HCRNB7IBkaB4Rg8b3Q8XU3thUqJJnheaYp5ysYe1b3qmDWQh+yVRWcN6d587Dt3s4CbDq Mo0MN3Lvcq4CvTKYAw9LEO/mMZIe7IPn5qACXcn/pQWC0vFLv90ag2+2pDY9q4gouE5Xhs4mls4v7 BL+Wl6PAV0yyLhnR7jsIW2MJOOpqJeQBaKRgHCfo4qxx9RVFEIgA6U0dSSzb+gn5Hisk/CT3xbTEl oY5Cb2ZlGReBTlflGQeg==; 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 1fOYVo-0003K7-LH; Fri, 01 Jun 2018 01:05:48 +0000 Received: from mail-eopbgr40056.outbound.protection.outlook.com ([40.107.4.56] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOYTL-0000R6-2Y for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:03:32 +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=ds7KZwn2jdAQYAPNigLpJjjs+SdK7YSWzM0DBKOEys8=; b=rpkzS5ScCzzYD2v2TrpoQl8KHlZtCWp9ZYfl69T4JktRQpUpHcgkFFDRE+pMAL/47/fjN7bYf5T4rvm3MATNxH4G5Vh5vYiXgl58FYpBvvq9UvRtj3KqwZldItWELct6AO8EUqzZQD2TZwqox6vJ1fBVtP/xMlorAI0LfNdc174= 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:39 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 09/15] mesh: consider mesh interface on dfs event handler Date: Thu, 31 May 2018 18:02:03 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:om6bFw10Nxqxh5Ffy3w09hWSk8zqvCpZm1Rhd8L5DZYpqgCw5r6/FyUQZGgmSUljBhtD9k7Y/KwFXXOhR5bk6RGsfgJyTLU3elenMyVp2XKoMvCeWAzXhL3P4nJP7271Ez+MMXuUrl4pzrjTZLto5qDTZuxzkd7frx/MJbfUjcJsz8Mm2ja+8knHnrMO6nCEu5Az9B4CPJFa0YmiW0D7tYw3L65Ud8ZGvqXKsSCT4NjK2I4msbDxaJ7ZDXB2w/e0; 25:ANURO8+TurTMIuYLRNkQ7dOdEkB1uJA3qQvrl3fqQSNCgdkZ4NdJpyVLgepT3T6yf/9VKY1EQ9SSiPgJQegsRXaj0Ss2Ep7kFZ4TxvumdzKNyz3w9ccL4Tr237N+zpCaDxJMETAzVMeDjCo5KJRkD0dQEejM58rAV7RbTIMtAXV+J+ll3GZ54+FSt+5ir8vrBb8fX9EKPBxuglQzHdviwEtIhtmCpsMQ3m0IStcDPUxWGBxM/koUURMQm3rZbRlH2L+buN8iedJZ0DyhLab2iGE2qL8xMfdBDGSd7JV96Axn/mrJDzJCGHxZEZim2jMPwLD4cNWo2PSOlgmQrHtqVw==; 31:EwvuouHPa57QZMhqdAO90QIAJ82gOF1DqxYxLL/Lc3hJ5iS0BIQRVebUhgN6Zmxs1NODYn2u9G8iSx431cMJzRNw5eGhQ+KiAOkNbpIW7TSS+vUfvQ4FxM51fQAGOoAvagJ2ufvucR6qviD3wJ5yyFGF54lC6Meko+D7Wg2x9iNCF7LSnk8Ymlg00p/5q202BMybPnGQblkk2LZvUcHgmeA0o8nYNBj5Tss1PqTkm14= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:yHB0vQVKxKTXG26uMe13PCT6OoO+tyS+kN7e8eWnoQolRUGAsG7SUpvgtw+ujopKBw8yJpdShjWjNoZJTbh5iGSe5fuEkLKy68hw5/k6G8y8HEG6EFF20xRAGFWeFk32xV8N+bUyvy3W3L+8ZyibmYDbLT+toa1yEJjyQ5M1RRagLOxlFzVd7m+Q3TV52LKmWi2Gs9yP1167NlVfkcZRBswcOD9EJau5U8/5czZRszO5k789/hEiZ8ISvIXp5TAsFDuqzeYrvAaJfSjlyGGeXYOXhzOTj8T0xVk2MYAfOlA7KpqXJg+DpOJYhACoaDFdD+v6mUkatmwlDghedcrG/sIu+tZZ6qF9avOeowQRUNQMFGCBUMrp/f1NDbrEtvsZcwotJr/+vL8bk09PEjw6JjA8GF85t93ckbEReSDfdlk=; 4:Qh+xiqxbP38R9o3lGXqE+GahOKBtOUOsYfBzXiMLHSx78nkEHKPuJvjnGa5HwYT9l+NR0Zac7vWQVVej3jDRb8o+8I+WNYd+tmo8N5DN02iRtzBxdJA/ZASkg+Zb35iA7nkSJp0Oed5Awh6DYFBtfIlaknTTdzXxZwOl2DmBW88G+NCpdaFAqtGoJbIOHgbUu0LN6ma/KQc3577DrjJhXKlgdXBldo/Fv8JAiuKBBzLU4IpJ+4mWNS3Zmh0gWJQA31EP7h5W+EoRtpRJp8gBPAD/pek8yk6aMSVQwvuRM7u1gBLTUeNvLQUKRfUNJ3iX X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85827821059158); 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)(39060400002)(6916009)(478600001)(486006)(9686003)(25786009)(476003)(106356001)(11346002)(53416004)(316002)(6116002)(46003)(50226002)(36756003)(54906003)(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:dym5KsCEiLM+LpNlcfXPU5FS902Ad/KTe1aadO9vY?= YU/PLAZ/AKA6i/E5FOnhsrr4xbgYnKR40WNJoC36W7dRAJvQkhZa9MrpbQ4IEz471pc9UonpckpEp8QXJrqp88lVYyHMjexp+YW+jSlcV5lMFDDGbJWoTx3OSbQGvLXODdi3gOGH8tD2VeQoPQVPfrVgvnuwcTVlmbcy8RbG32DriVt8F2lCI9zwY0us9ShByEUJGc969FR+Ij5IroGLg/AzCaYH4m3Aj9szGXh5uSCUATK1N3l2UMhtHUmh3UwOraOep4ffA3zjpEfdspN24sSXgbdTIyr2dMOg/8ha3AuZadQX2ek9g2LIkjAl/mgrmPvZQJy/+axy8xKOg985+IUcDm32RTxPZPSfVWhDR0r7YXeJXZMcOEXabcmm3Z2pTBZhk5GIHFH3GC0UTuUOG4xRbW4AOGsv87ePuyhHfJ2mpBFhxrYIMBu5fQTa3RC1gVd+uT7JQ8xXowcThDjsO/rNlnAiewJvUuhRvyubnjB7GiZF0cmxjOziJOxOgfaBQP1ednPX2V15N9gfxOTeozYRovFt0q6QB4Lvwm9sy09v45C6HBc508TFB6XuR/9tqjBuOcnIN7PsA5YZAZA5k1LpGQ/U4inE4Iv3tGEVsN2SqJOYaPUNGumYBRVW4Zz4cU5iN1E9MR7NtJW1EeIalVXLuXLvXiUhB17Xxb8TQyfYNKYcKj8RurzA1tyN7JqyoujYbeYykQ91+yuhC5o8KlsuvIzkdP1fuHIZQVguJMnGveV7N9eeN8lASDnusQ8rXk7VatREczXg9ESYwR9YxixaU/PnO4yZ1/kK5HtZ+Oqsey+ie++wu5j311zzpB19KNjqeshw8cuaKGPKcZ4XjJ8+GkByHyGbaItEgCN+Rz4cyLTMSnQx4uPoZIouwk/d6IGVne2mpdS72kQt8Drqz1IHeORMp8BLv1wqP9MBbnnYrqEVMydLfEJBHkuv17fUM4Iu2wQ4VKCPn964VUh3w1TChv4/BUKK3loY+zFOBKQTZQqN/jQxS4DO1nA7vNENQ0uraAC8z/RhZuii9VABnpI0nEad/3B/SZScRqJ1gWasHspJmpLagcbvvOEiQ+RWiajtQ6BuoA03BGdBaIWIDP/jw3X+w6h0U3NOUFDUR9gA/VJ0Q/zzKMokjZQ/5Rlx/ElrwhOgYWuQJUJFkdVQkCSu9q+cU0hnQM3tgSHySb2pJdLAKW0Onnrkgn8CwodsqBclmkm/8bhp7gAAOwFlj0i0g5eEuWB+St3MH/xzV5HlhsrQ5iSklQYc+oFT2M5TekwQJg3p1cov0qA4jk5MWAQ2YIV+AwQIxIJcaB8sVcSf9OBHnHWwA+hKnaiXQVKP3aCQLSWBdIpxW52rdYcg6WO X-Microsoft-Antispam-Message-Info: VttNN5PXbNum4xpN4YFYmfmfLxlmNM3itmveKhvAXc8Bppf3Jer0vGP+XC31/4UbT+pjrrYE3pgK5DGlOJSDSiwn7JqOJsHXUnIRXYObncdX6bRNfOxSIIvU5anZJ0NZBWBJQcsgY+KAdhLbx7o9c8D4V0tFTQMqa+DiJAMjg2GxN0JlxV8/N5JRRycId/Ld X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:TDhfXnNRYDW5sjS6Xo2bD2FogeDqw2kUSYEXFvpju3UlGSXVJJeXtvgM3VTjEPqWUxkBRxBQSWMARudDJicjZ7XiCb+w2Y6JoBhALW15SWdmADh1aaefIPLGHxMlOY3IhoTFj7xfOMHvjKzy0p4/qDzPRc2h6NcZkqyP46tVfKGLWf5grLr7Tn8DM5Z1ERUAIHYqEvsM83YZt5wFp3CnQDToI8VdJXkuSVmLVmvjWvlvZH/s3fIQ0ZUo2+PknnswpHIP6RmFmLdLRNr+a/0wOJ2hO2OXpVKXjbYHew7Hgj7RJNIolMI2VJ2iVjWOzlfsIgt+IS1ium3reJH8eItAKm0+SjUeyiXIFBSJuAD5C75k7TX31/p/R323TM9IJiHBHEGE/8qC83uUOoIcp+byyby6Jn0PcjV3RMZx/QWtCOYfKOJVBA19KoBBPB59oU3PTNiwWd41FniDOmo9a1jDTQ==; 5:xXO887f0/p21qKgXGK7PxP4p9MiYJJT4Srk3UkHjjEBku9IdhoK8+0DZEy79f87YfgQaUFbgqn3cKtd1mx9+NgFNdz4SX1bpOYh7ddqTLM3IjEZdwCCrbWIWWNxiUhXxB8Km3/JGcQQ7zoizqXVVmSiE2YOedVQFW9VDL0E9H4E=; 24:pDLymasFveUSsF1UGthcuOVJv3oJdWaCgx9ci5ld1+rAT2KGT+i3TtsNVLd1Q39wKZwXmABf2tC/y+AiSChnCOdpxfOsfQSwR00U1Optn7I= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:TvMwx/bN0u8mmGvx/2yC0S7d8Frbn3/JnF1l0MizNzhQzo36vfKaO6qYHwVIeVIxHxzGKaeymc5U9yz4B/651ou7I4do6xw/dUcsoEyT26vxcsVXAqm8L6SvJ8xGrV6lSHbUwNOEnCctZ0GOFPFE6EEFhADqeUvGk68OGgvo3rf8iv4BW4+Da1KQrWjnnfzspT3f1X1Qvd4Wf2Hd2WudL+8y9eqCu7mmGu1v/YSIMyc7mFVuJqEW21hduIsBnoYP X-MS-Office365-Filtering-Correlation-Id: b7a29e98-8efe-446e-8e07-08d5c75b5fda X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:39.7684 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b7a29e98-8efe-446e-8e07-08d5c75b5fda 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_180315_133440_56873ECE X-CRM114-Status: UNSURE ( 9.48 ) X-CRM114-Notice: Please train this message. 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.56 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Masashi Honma , Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh Once mesh starts supporting DFS channels, it has to handle DFS related events from drivers, hence add mesh interface to the check list. Signed-off-by: Peter Oh Signed-off-by: Masashi Honma --- wpa_supplicant/ap.c | 71 ++++++++++++++++++++++++++++++++++++------------- wpa_supplicant/events.c | 7 ++--- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c index ce17e57..42915f1 100644 --- a/wpa_supplicant/ap.c +++ b/wpa_supplicant/ap.c @@ -1337,13 +1337,18 @@ int ap_ctrl_iface_chanswitch(struct wpa_supplicant *wpa_s, const char *pos) void wpas_ap_ch_switch(struct wpa_supplicant *wpa_s, int freq, int ht, int offset, int width, int cf1, int cf2) { - if (!wpa_s->ap_iface) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + if (!wpa_s->ap_iface) { + if (!wpa_s->ifmsh) + return; + else + iface = wpa_s->ifmsh; + } wpa_s->assoc_freq = freq; if (wpa_s->current_ssid) wpa_s->current_ssid->frequency = freq; - hostapd_event_ch_switch(wpa_s->ap_iface->bss[0], freq, ht, + hostapd_event_ch_switch(iface->bss[0], freq, ht, offset, width, cf1, cf2); } @@ -1540,10 +1545,16 @@ int wpas_ap_pmksa_cache_add_external(struct wpa_supplicant *wpa_s, char *cmd) void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; + } wpa_printf(MSG_DEBUG, "DFS radar detected on %d MHz", radar->freq); - hostapd_dfs_radar_detected(wpa_s->ap_iface, radar->freq, + hostapd_dfs_radar_detected(iface, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); @@ -1553,10 +1564,16 @@ void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; + } wpa_printf(MSG_DEBUG, "DFS CAC started on %d MHz", radar->freq); - hostapd_dfs_start_cac(wpa_s->ap_iface, radar->freq, + hostapd_dfs_start_cac(iface, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); } @@ -1565,10 +1582,16 @@ void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; + } wpa_printf(MSG_DEBUG, "DFS CAC finished on %d MHz", radar->freq); - hostapd_dfs_complete_cac(wpa_s->ap_iface, 1, radar->freq, + hostapd_dfs_complete_cac(iface, 1, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); } @@ -1577,10 +1600,16 @@ void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; + } wpa_printf(MSG_DEBUG, "DFS CAC aborted on %d MHz", radar->freq); - hostapd_dfs_complete_cac(wpa_s->ap_iface, 0, radar->freq, + hostapd_dfs_complete_cac(iface, 0, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); } @@ -1589,10 +1618,16 @@ void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; + } wpa_printf(MSG_DEBUG, "DFS NOP finished on %d MHz", radar->freq); - hostapd_dfs_nop_finished(wpa_s->ap_iface, radar->freq, + hostapd_dfs_nop_finished(iface, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); } diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index fb77f1d..f9cef7c 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -3808,7 +3808,7 @@ static void wpas_event_dfs_cac_started(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { #if defined(NEED_AP_MLME) && defined(CONFIG_AP) - if (wpa_s->ap_iface) { + if (wpa_s->ap_iface || wpa_s->ifmsh) { wpas_ap_event_dfs_cac_started(wpa_s, radar); } else #endif /* NEED_AP_MLME && CONFIG_AP */ @@ -3829,7 +3829,7 @@ static void wpas_event_dfs_cac_finished(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { #if defined(NEED_AP_MLME) && defined(CONFIG_AP) - if (wpa_s->ap_iface) { + if (wpa_s->ap_iface || wpa_s->ifmsh) { wpas_ap_event_dfs_cac_finished(wpa_s, radar); } else #endif /* NEED_AP_MLME && CONFIG_AP */ @@ -3845,7 +3845,7 @@ static void wpas_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { #if defined(NEED_AP_MLME) && defined(CONFIG_AP) - if (wpa_s->ap_iface) { + if (wpa_s->ap_iface || wpa_s->ifmsh) { wpas_ap_event_dfs_cac_aborted(wpa_s, radar); } else #endif /* NEED_AP_MLME && CONFIG_AP */ @@ -4284,6 +4284,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, #ifdef CONFIG_AP if (wpa_s->current_ssid->mode == WPAS_MODE_AP || wpa_s->current_ssid->mode == WPAS_MODE_P2P_GO || + wpa_s->current_ssid->mode == WPAS_MODE_MESH || wpa_s->current_ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION) { wpas_ap_ch_switch(wpa_s, data->ch_switch.freq, From patchwork Fri Jun 1 01:02:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923703 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="EHFXbhcY"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="LawUotR7"; 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 40xmP16By8z9rvt for ; Fri, 1 Jun 2018 11:06: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=8RT1QEhJnrho9HguoZFQOcvaJqFmtsVLGxffrfYD8LM=; b=EHFXbhcY5j4qUp EtbQNLY2ZQHMNzeuG9YT7OxOveOdjDrC10EowWgptC/rrBSSgZhH/bmMMdbkoqtlCUn3QdHZaGwWf A1ZsRWF+XU9mDxME13zLpzA2MxHNq6kPWsD1iZHin9x3tagbN4tdGtujztNi3qFSPRr+y37/riF0o YkBPnd/3+QyjGioCkAZLTosWaZIiWsoXBMvhVerbHjdF9ufbs7ECjglP1RChSuCSVfwoifxxvnQnG sydu52itNON4vH/T4X/7yTSCzppRBu1QFEMvO0BkOSMeKPgWvMXVPBEXlTFyDEmLvUiI3XRM5WsFm 5EWSWq9tRe2BUV4PFf3Q==; 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 1fOYW4-0003T9-IO; Fri, 01 Jun 2018 01:06:04 +0000 Received: from mail-eopbgr40083.outbound.protection.outlook.com ([40.107.4.83] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOYTT-0000PE-12 for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:03:35 +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=UHeJfOflPOjOei8iaF2ShzNP8d09ow/Rt0Cb5l+VdeY=; b=LawUotR7kFy1xbVbRc3qC/Z1iGuulhujcYil9T7vQKovcclbSANO2T+xFnEHPalLsw6rDXujnEJGYVVDXVOqbwEgk+DAxYAsukrwe/1dWwwb/0VHsIrWsm58BNPOTZR6nR6NJjFx4/0+48sMaOtSjyOC31InGK5z+Y40DP0Z6ao= 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:41 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 10/15] mesh: Allow DFS channels to be selected if dfs is enabled Date: Thu, 31 May 2018 18:02:04 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:YK6dzZ0pg0AuyjX10g9Ye9YGtzzAA2wdhNOgaV3+7MIcH/+KcaphCiZsDV0sxuJrhos772P4cvx1Ib5JLeHSCg867ihdCt9QsRTg+wQuNaf/2uqkZ4UWkocWoWaW0UQ8I4bvtTN8+DaL93k8AblB5pCENtkUHlhi7WWu+gCWDxl2o/tUsA5+2B98Lc/pdysQ+FQbi0OYDdVJk0bdkJuPSKyOFfEhco9DOtxIN4K7MFLUqJSxxrh+LJ0qZtAZeffB; 25:5fJbG39klSR5Vc24K73iDFTBBjpnCqnr1soYvZn/XufANB7y+/BfNakwdAXvlRBKr0hwFsKT3chsvwT1IHZKhOFSCZOPS8l00FsFHZX907wyse0t+Sdg8DjKJQLOGI81hTnoShGdJjuv/6co0yG4GUOQJDhafAxtQ7vuU21LCdQtkuVpz7b0H4EHb1oO/HU9dsyJmsvGtm7TQIwNn77iJfHqGd5ukAy7hqXBG60eJFBwKVm7kLne9Q0PJqRmeZNKdOGdTbLuolE/QmUKpHVV80VLfuIqfjZBW7kFjzybkMTH+tWIizogASmCvyAhQnna5oroawm3woxg7kKc49I2UA==; 31:ojBVKhsWecKDVXBbud7YhxO5RMZpfx9HHCNknpjeEYZYjxL1ViwVpM4HaRjQFio7y9ja1487/PupyHND8mzbJsc1aDEdnQwOwNPPLMZmdUlw92cRSOg0J/e57GQu6Er8PtvxB59M4OuZLVQtZku6n7yEynowjnZdBVALDeeo62xC7OsnxskAsV8SZEG2PQQwgsBOTxB1znRRUeJvIw7N7Csm2M5J+xwQLFcquDlaaFg= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:iLReUXcUT7TmODzKZl4D0ZtnPVAWxWsOBZmKopDamu3PFwXgye10uXniOGY+jlqdF95AJvB3gn07QUWrXnuW+zkpIYWvpyaG9w7NkIUG9BAjfYzrKlEibsFQUkbEykZciiQuvhoiV3CG43A95Mbm/fx7+d0Ox/b1ctLLw1Mc6cpK3OT0R5E6XMvSJQxV8E/J3tUq6/3j2QopkxoQ2txx1Yh/VIEbZtvb7FRLFxVpMtKbpdd7wov0xG5sL79KxmQoigXgIJ4TgYrWsP+stxCndidMncg6vLvirZ3Y7WMql3dc2Qw67/94WF4nqJmQvcBLEg6cRkVgHx1JEoxXUOzf3GUTO76J9J84wWAbP+LOKeWUaWlsoZxkkEJ0qlu+C0ImWS4IBNtKdaFd9RW7GYHfwx9WwQyTOPAg0XToI4SIHxg=; 4:n9MGcGRMQPah0VljYsMHXDr8i1WKBn4Dz1TiPyW+SP6BlOyCE97WFV6kHLcD07R8J1Eh6WyXrkewxau+xCfrit2ozx1ON1RI9A7BPGoW87EstrcT/GpPW1y9kBtobMbca0VgtKcZ8wOaVnGq+xDZSsT1UnAl28qc+FgFfNcxwxlAhakOAaIL5z5lfnsJ9aymRogFHaZPJCub0tjXnTwOE509pwjFERmChPqevbcujr6opjKRXdRdADZIN9Sw+AGYNizQCOr1bJygi7JUwYCtCw== X-Microsoft-Antispam-PRVS: 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)(54906003)(2906002)(85782001)(446003)(16810700005)(53936002)(6486002)(305945005)(2361001)(81156014)(81166006)(69596002)(186003)(76176011)(52396003)(52116002)(2351001)(16526019)(51416003)(8936002)(4326008)(59450400001)(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:zHPAW4mPNZCLd5XVqMpSThf08zrwt2LOeUoyo1l66?= PxhHj/3K//jWNFo2FxfbuR/WxutDoRcu+h/MROxaJ8O8iif3nJea9514CuVDGVqnwyZnAOOtBEwCTFp5eMgxzpDkjqvHXhbdtYhgMn3IsiPkLLv9r3tLGo4kSMzH/4MEpV3phjjaUihpi9H7f96k3FrxXe7gybi8cqvJSBYyeQ0/uK+OjhnbmFDJobtz8oGISVbRPRwebsnQIRgJ7dKxHyH4WvES/i//okFRtfaXNJeItueyfXhrziDQnNAf6i7OguipNxYddRi5cnzxQIrK7Lp+HLDYT/ck7AU/Z7j1+rXFYsOE5W5GtKCpLLBfZoo3ypadI3BDHSZ9HqZZE3VX/I2hoR0H4qtAr9GEYfyCZKBtSUMu87AImeZznedO1YUjov4RLw1gZ/jB8JQN2Ql5FrFaQ1p7TPaYmTorSZ8Bvbc8d1eIhK1JHDT5R5INPj2gS+vUte/71OHfWCSRITMXy7aWa19BDqJeGtclm4dkWA2ZU9DCj0tHz6N72GqApQdcT+CobRak3GZ6zwmr2gsFsD1yf0trND3wsXpXr5DUaPT2B/4bdtIX4I7RtwpT3RPYh8usJedKIS0g+SaNgTExt49UymINDAMcMd8E4Ef/ItOWgEKYCca0G/RUis1z5iY5+yjcVT2RfpPjwGIYZBZohNUglvM7ryE55lSVT1WJ2GLlHvHezkbwPvflXYR3ageIsc4n65ZhrbQ/zId/2i4y4cf9PtfU4Qk1gNOGvn/75y9esy3d264kiB/g75UK5sIj1sF4kq9NxRqPYu1B4WUIX8KPwquSENUAsCIy6mPH1rl5I1GsNu0sLMCDybnZu3x9gOe5cliLJfnlYgJ4RIKg9cQZV4NU4CLfR7qeW1PmlvS4WEJNm+R+8Ovj1wURt3/uzl6XDo4aK0JxdwjkRfp+l7jxty2vkZDPK+pTsaWAUaxkwS9QuN8PfPz8jrPkQdGyDmbJ3rp/OwplaU+kfwv9DxmH+kDlvp1CwJ/7bXvDoRCkHgQsuX2KLeiyrkiUY8Gr95KsnUWOMLwx1lCGebvyDk4Nkp8x4xy0FtyU11qP5cHDtCY99DO8nPlOmxA9QgL8tY8rgfI427FaONAIbpCHjDF5egRngKcfrSjKGwIB8iX9Y80fB281/3EIx3CJjuBvM0z3uzUvwf5qc26tJVXhAgGa8IsVV7s07xzIyjR/CT0spHpFDLBSPsAYs6D5R/ZiMKknh+08/j7G4Q+MTPme91w8HW5Hx+GjIIuhwzmjdbl3sUlW+/eTyTPiT0IWeAPRpkg3ALZ1mYzWqwbcqzpjkTC3Fty/L/zwxQ5oXsWS10Ju8JUVr3XIRuPs0w4w0Hr1QEjyzZz/BS5cy0U7CBChr/7 X-Microsoft-Antispam-Message-Info: dJRkvaWL5acHClqFR5+XizgvQQpFvgde4o/rq4hI7VpfbN181/KesO3/OotgezFECks7oWfDVyalvXDjzka9gvmZ6a6C+B8gu4hTmrUpHxkmNTWkCwoXVh2TAT5ntzg5cylqDMwUK9olSdaf/kcor/WITGBxGXez4fS3pX9Un6iIGNceBKzz7HtvckF1NiHD X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:kygRSL11CGjNcGKlCpfNXEn0GVEGBhjB3ZhPz16ToahM/R963UdPqMKjqjuWzL22xykFj3RQLXAE5DdBc0mzYeH8WUK0YKcEKnB6CsHWeAC+IIr9joO1xg4XWc3XUcbyLjPW3/SMRelLGMvDOIgIW5iXXwsae9uc++0pZttisy7zjWLBtH9e0d7KxEcVuraj1tXdzE/hIuU/4Zurf9guqVioZfhYxk00BN4906sBba3rgSCyyUc1eBlvWhzGCutGr80Ij0SLOFQs6NwSEYaopxmV+ECBAS7U5etiS0eEH3fjh32vSAJUQDLR6lv0lyhRJ1RgB57updFIz82nTBtVyIZHIW5/mJNK0daZNAn0VBXTgX4sw0R2K+rpg4W3ts94/V5/E2NFeRnGB2J0lUZnHa6CN06fG4CPCTiqqGTiVRM5AgehlNm+B1eEQHNKUjY4vDDiARbPtp1jDMM8sin3/A==; 5:+5NCJ2E0JRDwdGuvQyKpqs+Ii2tEfBAG1blNMiSU9fwl9suoWqj/74rTzdySYBcGP+XsNyUqUtRBLgmiUCXQeRjIK8twR27FYAmoBnWxFv3EnscrPcmzQgSxaAzbJ5T2HYchiNwW5LnO4Tp+FPRT5JCkKaqjMiaTFT9MrMLORNg=; 24:03fCs4xp3OkHSeS7LyEc9bAi3mGraMwhz8sHbo2vZlMoHCdb7mxZ2u9WZygERdbTx3kX6kV49FGwWuF1Kw4uUUH1O19kQ8y6+6EsdKFWywY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:isdQ+ZoOpJqJQXKVHUQdLhLDc0EUtGwZBTW+a8qKQ//mhFbu1WQhZR0/sA1hPH9zzegVCz3BxEuGCyVBK1zOuzj/kBWENANqvCdAdsXgvneUfTxQL2J68IDsgOgbTcI9pCTzv1eB9G43ufpdoz524TUJsJF7VeFtrC8pSgSAg+ypyFxqo7sIdFrTnV2Ac+4dqOccuvV9mft53wfgcq+LBMCCYtz9IlmnViUf+Xj+xsgrQ7DIhXH/PNVqHegPUFcP X-MS-Office365-Filtering-Correlation-Id: 6ec95138-cdb2-47cd-7217-08d5c75b60bf X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:41.2841 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6ec95138-cdb2-47cd-7217-08d5c75b60bf 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_180323_085483_33DAED5B X-CRM114-Status: UNSURE ( 8.85 ) X-CRM114-Notice: Please train this message. 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.83 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Benjamin Berg , Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh Note: DFS is assumed to be usable if a country code has been set Signed-off-by: Benjamin Berg Signed-off-by: Peter Oh --- wpa_supplicant/wpa_supplicant.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index d2613b7..847cc1d 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2067,6 +2067,8 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, struct hostapd_freq_params vht_freq; int chwidth, seg0, seg1; u32 vht_caps = 0; + int dfs_enabled = wpa_s->conf->country[0] && + (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR); freq->freq = ssid->frequency; @@ -2143,8 +2145,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, return; /* Check primary channel flags */ - if (pri_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR)) + if (pri_chan->flag & HOSTAPD_CHAN_DISABLED) return; + if (pri_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + return; #ifdef CONFIG_HT_OVERRIDES if (ssid->disable_ht40) @@ -2170,8 +2175,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, return; /* Check secondary channel flags */ - if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR)) + if (sec_chan->flag & HOSTAPD_CHAN_DISABLED) return; + if (sec_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + return; freq->channel = pri_chan->chan; @@ -2261,8 +2269,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, return; /* Back to HT configuration if channel not usable */ - if (chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR)) + if (chan->flag & HOSTAPD_CHAN_DISABLED) return; + if (chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + return; } chwidth = VHT_CHANWIDTH_80MHZ; @@ -2282,10 +2293,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, if (!chan) continue; - if (chan->flag & (HOSTAPD_CHAN_DISABLED | - HOSTAPD_CHAN_NO_IR | - HOSTAPD_CHAN_RADAR)) + if (chan->flag & HOSTAPD_CHAN_DISABLED) continue; + if (chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + continue; /* Found a suitable second segment for 80+80 */ chwidth = VHT_CHANWIDTH_80P80MHZ; From patchwork Fri Jun 1 01:02:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923704 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="G/SeG2AL"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="aOrDpgck"; 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 40xmPj2RMrz9rxs for ; Fri, 1 Jun 2018 11:06:49 +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=ttQzJo8L9AtDquYz/10+GvDjCgfSw53TOI2hVqsg5jk=; b=G/SeG2ALhlT3cO I22ZuqyYEi7jPP8oKU7eej5WDOniqlOLAKLm5XXTupPrhBmT80QKIAvoa3cPi6M613ct37Vr8lCeB Mfh1mBBhxf9AV6rLsCx8ZzWx+IktQECwn2MhqF9f3vHIwZOdradpITVrwiTvwW76qv3yd9w4rtMaB 1HxLzJUKLnLbTjPUApqmFtlOvB5Rbc9lgEcKXciw7zAptZFIU6UUSQgDA/r6H0sjF4xUo9RXU1ALG ZqguKvPMePk40XifHalDWt4yclU9IPRqhNf1j9NA8A2ciNXHPtEQCjajW4tOjHqJx691JrhGeaUXc juG0KnOBFOnkvNagP2Pg==; 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 1fOYWf-0003ow-QX; Fri, 01 Jun 2018 01:06:41 +0000 Received: from mail-eopbgr40056.outbound.protection.outlook.com ([40.107.4.56] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOYTc-0000R6-UC for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:03:43 +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=JsFq4rYVE4hlO5YtskuLL7V7iZYhhtykhymXl43fvuY=; b=aOrDpgckX2fbzEzfix3PxQM1uL00n2R1QISRTVUbTcFOqwcobqqknvyo1i383G9RPnJixNXD3+hZA/5aEG1ah7KK3WUjAEoPFzJ1YBdTqpobNW6aBNAgep7HwXR3bewKSeLuMQoVO9LIw9twkbTk5qnH05Rj8Fqui+n/rK5vOXc= 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:42 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 11/15] mesh: do not allow pri/sec channel switch Date: Thu, 31 May 2018 18:02:05 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:1VDkb09xTjOhog1TPHydFMYP3uBKZmNWKsrbxu4aGNKgl4Xm4ugN5YfilGRutp279NTBfvF8+ehe0f/U+xMPhMp1giDrqYLVtyHyPYNXyPlKEfLWUbJWChPNBjc9AqsWIhTSvRpt/9i8KTkLoNGScnzgOQPecZfoLfU0h9N2OHdqv1SeGE/iqb9rGchMnP5gXpIWYeee2VRDAg73g/jTgcGKSxnIbIH1OstCVYG8ydcQ4wDtevvZc/5C1+SGRkTR; 25:8lleQcTYXa3K1yAaK7HfYLrAbDw/EMbhnwGIXbzMKXtAUYgRbunWUZLMisrbWs6yxdPnPeD7Hws/L6uycQPYlQwe9Dcgs+Euslg650K05tLKAIoczkoqftHEG3U3KCbIquNf1IQuDFtQHYvm40AWfpKVY94FtDdFTwIV6CwBNBnxLp3axR6G70NqF+HuJXfUiGtZWoEXnucgDdlAeFWUR8hEM1acUJHdxfVfn4ypZ6a+xoModF3BPxMxKy03HgGJ6MUARK7KuiSC/hf0H0LLVyV+89s9BRNnreJJDE+hj9A/eZVImzLD3lggBLQ7RaFMBAQ8gcFmhnUaZCqm39v75g==; 31:ppnz2ez9kgsTA91FlkN8Ld2IfzK3k4n5fP/Hj4FO/e/NrvTRZV1wWqsVm8f7kTJk+5BGhfOVI8GnZl4146T8PYZ217QzdS0jewLpMRE2sqc+FTX3T1hExmYp5HSeVZ8zIqC68V0nwhORcIjdJNOTVz2RiY7d5hRGN6D5jsa/naR25MPobuqOWNtN+cINrDMY2aQ2O7YcBUouenU0DA4xCeHxlfGdjMKmuDE0ZHWyFJQ= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:cVmh0wBr/qHTHlvQvYNB0AS1h0DDe8r0QVGfiyKI2YgxCUJzSFv8vjKZXfAueiv8CxVpvPmWkeKWHFhdQqM2izcG5VeW2G4Fz0EU1Pv13l+XF9cw5mTVYbIfl9IgZxPZ3LfsX4nWt9sfAIDmzzPsxdjat4rprLdn9Kj/aeG3zmWI+gAF/3JHHSyYCRNqrUWTPfaAXuwMef0Ufey2Z/9jAe5ORnKnAX9+wVDI590LSIM15lIIzbWWvl493lmtsqVORts0cyPe4RHGY3gvEnsejJrjuBm3Z2VKjP7nxev9WDPO3r30BCgfTAU+a+ihlLY3f3nj9h6lH6xs3J09sxM7TAdUxcelRmvx7315Sac47cA0oZ/gCqx4CbyzUrupqyKMoreCZXLNR3MQu6rel69Nj9TP3eUgrd8C1HiCr6prKbA=; 4:1TIKzjgkrz2bovsTawopQYz/vNRHhybRL5cXRAWyWfvRjmso3Sgv83NvdgIl+uTk8jgzfEuvKm7jWeMWRinYa6guiDnMmJqKJ3tMDCtJAtmeSX87oKb4lGahwjzMGClvn6DJ5vVAYbo7G+e8wkp3cYtqsbwg/H7zpjOTGR4mYfhQs0SmT+30qjex/Ia/uTfB8JHHhAIoJuPe20k8nL0Ce4MtSulw8dqxkmy9VQTC/SwqjEpdFXcEeDPwhISUrGg02ZPjj4ZUwyS5DO9ZTIDfYA== X-Microsoft-Antispam-PRVS: 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)(59450400001)(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:hHBoxCHbPxAdpLAEXqb5IhDK9+Zv+ZZU/ttiyqmy5?= +R37Nfa/yCBvacVCiGAcZlylAMFDtm5OkEU4v8ttOIl4Oj9rsYuZyTUs1Z7ubPT3FSpdczdtMbgrI4uW6KrSo0oXxNkKLc7VoalTn9h+u7FleEaHc4DbBgaNNBwQBRFm80kWqoXRJhif2yM0j2lCUSg8c47JHvHgZ2Z0DHyN/jmJENLsfpOuzM3kqis3ufr34ePDkmBsKhCixgVihbBMrlxmltx1GHF4vtbttEaGKJttlMN68BUsCNjvncPuMd91v/y0qC0A9MRipqgAfCHmJMPIe/8se8sqSQUC3mY9iXZBdXQHtB1tV2nWaJA513Ae41Q4FPxC2n5IYM6aH1bdKwlxwAvZKQiH4zIM9jfaQWOIth7ErqkBZxsRPb+k3wju7F/R2oF/j7FJAYePYD2HrMm0yyBdU/hKMozSIoo1IGpc4h082qLL3f9/ozcmEX6dc8GazHdxYDiWgEEF889eNnd4wDI/mJqCd3YV43Gfww0QlEN1/DfCVSeYLK/1I8Z0jiwV8pS3RLxt1eooJB1Jm4IPF5CSDPjcOh1L7zcXbZyogy4FMsYXnkwULs1h4720+STS7SITtuBQwQSmiw+cFZKQWt1VuVQboQnWwg7R2b6CS5+RNZaQF4OTShS4xOcGpgHo1pE0f0YCd9uEpldpaZw0/fbzXr1Ta9RrpKPpv9qFo2LXJWauAjPqY+nM+Be4Y6N97VASkBLebwAOj9cunUSUKOGs+T5fc+aOJmm04MRW4EGreT6LqT/89YiDlsWZUFcltbCH9TISJ3jM0WcrdKify227lGXycOpSsShYXItVmpwS8hAE6evDHaSvimGHfsEKRuTFYnq4vzc0/KotMIANT0URSLpeNKGIMxEu/qq8kG3kMS1K1OsEkTrdkUqnkT6/cpSI8TT4P7w2uDdNIlc7tic5VbhA3zLvy8TVNAg6GVxeznvtgwyys7b3Vccy67BETvjfL/suKJbTXeCi7BHYCpLSlv0cP1MaLuyZ05oW+X0XeKr5iy3hbkvN7lVHg+ZYYtcOUYe3FGakl0Hxp1KOj4n6lSFaMcYi3Kl0jgIkb5ou7CIV456BmCXJveVLQk2+UHpEaFL8KLEtAQkY3QzELpqKWdq+KugJRvlrHEKFqEo/ldHQJgb8gX2K1Kib20miCWpaZE2Kxzuj5bEr9kvcvrcAims88Le4C4UpCHJzu5sVhQ6kUw6Qxf98ooibU2hrj7o/e6mJzohx4KZP+iSanKvwhQ+dWfpJzRHfG3BVFeRCht83tuWlhoQjguSlXjGla2bZno8TWszKVIv6a4slBkcs6g4NIv5TpMYa4fnHS9mlJGYmOyzs+4chYF9eDH3YsUfcktuphaXl7xuk4ml X-Microsoft-Antispam-Message-Info: eKuzYjKf63njOmD9eur522zGdKJE+IQzZ/Fj8YCNs8AeuU22cAZDKCeOKNsI0iast8QZmp+YRuGYm9I52VxyLThvq1wTovU4vWH2283Z+lxLjAe/Q4E6IYQh+yLsghnLUcrY6oOBQf98XE+btagorgb5TZ9SaIGrzrNWnH+Ki40pxV94TN4ig/kOYVMBtlUd X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:51KgNQ9OUO5KU0gXQjND0KOABzOq0n4iUYaWCYj9cy/2qDcAInoiTqWcZezQT43XYTAoSaaX8U/oe+G21WDy7stbHE5PSiMf8e8bsznQKI9Bk6WWgAxsO+IBtsRXF1g5niAnVcdb/2NoAz43qZWKqgbeYegv7akNgR4BYXzp/wHVdnlnL8/x4k9jhMGyLvpX4/q5GBljfxy6eZ/3/pdkg+/fochGie96i1bbnZo6MvyjAFXrOGGVn36ZORqhclbgN57J+dhxTASUtODN+fDY20VINC+w2CygB1okMNqGvgg15mRok0dAhISrlM7woVQkfBqLJgyyDa3XNTSsloGBR69/vYwPN4kpk6VJDukkskMDb+CituuQr2l9c1vzNnYM1yeexkw/sTA6KIxKNVuj0QK+HzkyRzhdvdy7l/foFWBbXYgljnqe3gF+kc2A/I2Ied8dppDDYDTKoE3uzWWKlw==; 5:/C/0ldrWA+Y0Z/wZGOk2/b2p2U1QTmbgeJUq1DQQwkZDTevLS4FfvrW9/T2dhGTdOsIRbdB+qrB7SPZghecxY3bqZO6CGSyczknGK97rBxJOUXJpOTURQjOJkG0THhBsk0cc1k2vjf5vh9oiYDbFU99JRcx0LALQbWZCbOVEamo=; 24:pS8TS0y400I+NT7SxQOiYyWXg65FTVciZ99GxN2ma7yHodl8mjulRb2mTX3xActU6C+x8IGLapkvaxbUaS9zDuSoSTFbau2aJ9RnrCsjiFk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:2j4LaIgYNvWnSNwMZ0djKhD0Pkfu0qO7vhARVt+6I4beaLBdujApj6Ah6QOxxuWp2ohWzjqxJSCcgYAjlAOCV/h8RaupdjJGACgWMriXnYD5y9wnEENX1Px5ihNBKJfJAConAo1lDj417EpLKmvjIbq7dgSISZQDF2snSo+K4o0+fzyVrpbEDTANt3m/YA/8uGs4afcUZT7SEIoHRgBzaV+jQujOdA+6RMT0xmt6ja3CV0hVOTY66BDn2OpUYwoz X-MS-Office365-Filtering-Correlation-Id: fe5e46e1-b7d8-493d-7e71-08d5c75b618c X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:42.7997 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fe5e46e1-b7d8-493d-7e71-08d5c75b618c 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_180333_005326_4F745878 X-CRM114-Status: UNSURE ( 9.71 ) X-CRM114-Notice: Please train this message. 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.56 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: 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 We don't want mesh to switch the channel from primary to secondary, since mesh points are not able to join each other in that case. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index c73990d..3cbfcf3 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -338,7 +338,11 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, rate_len * sizeof(int)); conf->basic_rates[rate_len] = -1; } - + /* Do not allow primary/secondary channel switch in mesh mode, + * since mesh is only able to establish Physical link with peers + * on the same channel. + */ + conf->no_pri_sec_switch = 1; wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); if (wpa_drv_init_mesh(wpa_s)) { From patchwork Fri Jun 1 01:02: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: 923705 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="ivb3UtIJ"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="ppW0oUJG"; 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 40xmQ04qkmz9rvt for ; Fri, 1 Jun 2018 11:07:04 +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=CbY4DZ2e4ZaQT1/eNEi5nURWGQaKrvRCVrILcMaOsjs=; b=ivb3UtIJW0Q/AN +bJHQSX50bB610qcKxBmrwGtW8ruSr+EVshZ2KSjlWnHr90ns7BuBG0RQGgm9qMrgHDnEmL19dw2p W6ulQTHpVKOkRn+tCIGRqObq4T0+UAfKhnNzfMoAqaDiQX/8gtXysMDuBManeUOjg7h0LR0QMNExv Vxt8ivVTKyfGHRxWFcXpCAkSN5l0FpJCYu6fCyVq5lpJZGVdsIfA47d4fApt4sFgRPouPsOnYida5 3so3Zn1b5vZOZSVO0nM2GML+bZoAiwXG0hv/vDE9SuiYxbjci3yQ0BpHaIDT0oNWO0P9pD+KE/uay y6rFF4ggaNNlYj7+J0tQ==; 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 1fOYWw-0003zp-VO; Fri, 01 Jun 2018 01:06:58 +0000 Received: from mail-eopbgr40083.outbound.protection.outlook.com ([40.107.4.83] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOYTf-0000PE-Rc for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:03:48 +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=cMJeBvjKxloTR+PI5ZrnnYCa/9iS7T0U7AddL3brH68=; b=ppW0oUJGCZlOmJoROhVJGrDbNPe5TRqDrQjyhyXRjUvqvMGMLm+lv1kvu6gLctEV3/Qi/58bQw13zEpNAIzLrzGgub5mQ+YItWiZ7cBk3+ZPY3rVg2Hx2DS5nf5yzVswl/ZHvwM6qls81ZpVZLkWLEkYyjaNIMqcZ7NU+v3vJ3c= 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:44 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 12/15] mesh: do not allow scan result to swap pri/sec Date: Thu, 31 May 2018 18:02:06 -0700 Message-Id: <0eec9b50d7202e26b6975696f0d220aefc98484c.1527814610.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: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:js8/o5sD++X5c/L+942ANxhTYT/cf3yb+pNFCg/2lfF8OkkUxceZ98qS4heJO0axeHsJvis+kRaze8RxQ3pyOu39Sfi8UyP3WO7dIo8Ht3Iq2fLc+VetXRZdPeTO93wG5h/poyX2/hpGbvkgfYRzcQdC6iNq3M7qG6ZaIBctETGZg+qUdD8+D9h0kjzIBXibwEz+l8O/p9cJI62g01CuiXDr+b6lyvzWv/JPis9/iQx/vu5xZkrqwE75ir2R5i/e; 25:O59fsi15+ZiLbMJeF3J9PxtgCUARKe4WJG87rA7GGiSbtkORXrkJvvqF1V35kFcGLHedzPIVuNHM2vCRpZUAtNlW7Zjgipwqg9Bcc9PwXOJRteTyssDuKZFL/Gg9OHy/nk5ZjGYsPYjKTGdVb1yESy08w0zPROLINS2/wxnDu0ypsbprJbO4gDT2036sKNYmvyMxLFLKv1deWJwcXcwIotXVQ/c25D2I7WXZcEvFpktmyC39n6Ui2o/dSWLyK9Fp2YNXw4f44gMgVbNxbiZ/Bpz9pDCtlR3absF0fw7RhzxfDxKaZM0MphJkEeHOKUraqudP7Zn0ZejUrCZkC+ss2A==; 31:i4StukvcI7xpybCdGmXdwjwj/v+7fMjXt+m0hdFiXbUz6HTJLFQMQ0WYMLoNsVIbJWW/ltjuHqEXJ2wGHHLnlc5q4Wv9r+YrRM9Z29gX2K1aaZ2Q9A32DIaYNCUyCfHxM+P+4PRC4XxSQVcmWlavw48O5hfJoznVQoYRQL/JFDF6K77QudbzFaRQw8X2/QNMzyLNujngXizo6GGLBtuCqMd4g4zcjGM87JeiFMZ7t2k= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:0EYwgQJ2ytzfKZGVB+OUvXdtLWcG8TC+Kqsg67KYI0qsEztJ4xT5Tmom/H/M5dAiDY3hiHIBSDwQGzUm6lkS7PYQo7as5s529h8yiDRsugCpwR2dpNvbscNbCBV9ydjJEqW1M5OLwHqC6Xisf8gmV5qjyfb7Bn/MEF97b0YqLLLcP118gFhO1pqKwZ/tUesiq8+puFVf4/CcXnkeDwQkSJ/DoE+i/688BAJ+wCb7le/+1EroEPwMUOAFls9yQkHuXhOUp7F4wKv2gjES/HlRjPtZhexJjPESJIsn58EpQa/97E0KYIGl+pMA6q2eCmXwnwHh7ufK8cVp8f4c1lvum+dgT41gUVpe1duUcD5c2dZYzHp4GIP5RS2m1eDUHZEDSTeVfSjhMa1epPpyMJCCgx8VrmyWSKmWfp2PzRp5qjQ=; 4:tgeYaVtH0H/8NBvmClHrpOU2WIorFOaPFIq2L4wDbBtBxMpBb20d44UMNp34jx1FU1R41gFtclw+dm3Nf/UY7I7jCwA2zMVrFicRNHUeac5gkj9qdtsz93onzh6c0C5W7PDwnSHBcqW4fAiOnPvy5Iys+5yVdmrlZT7v9WZsIv7uhbLUbfptp1xKUjl7wbMJXiIfyBMOQeVHgC6iXKlgrfif/ziqxVYO1XgtKyBFcBCkUl2aQu0RAes5sVydz3UW3tJK8k/y29C3w5oeyOmdWg== X-Microsoft-Antispam-PRVS: 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)(59450400001)(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:dK80WbMB8bSvKw+CtSsZ8SuHDNikAGo9oQ7Y4bEgO?= 8ihg6EUYw5tt1NfVKnFGSvJaNaEcb22VyA3i8p4UMGpwEIkYXI8X9geThXatl6LnjY52upe5g24zdossifSEwqF17C+UC1pk4USHDo76tULDv2qiSmlKvQ4ls5rLmxqTg/+gxPHp4QJLKbXIS4RCB4PwThj3D30bdk0oRPeeNd2RdiiAJxrPRxAXvj8YiDVwBrB3/BPQMvhxgLcz7OTfOHqcF8QrX9NnUGyeCahEh2ewqDISHm19nVhZKG4sbnlu489OLgJHpc0ARlmHCsCQx4JpZAGtdv+HYBSR/yiFKdj9OB7DvdPUfPeHANnDTwwi/SuZKs429rxTo5Ae5rRPjTUAsFmeqvT7YXYQI11S4gxAG8biSK/apUWikTpjW1BXlO957awig/ANH+7YahjRZimmjrTt4k7abgZHdSO8D6DYYfHyLTkFvCOwOsyXEyKBCFjFossY6ezCdTBqzEuET8Kr1eNQyzwaYJEmtNI0YscEErY9AH4M9vHGQpZSbGIdisQ1VsHPGjcSNF1cOo4Z3RvJ7zV2n5OnrDA60rCFTEScXSYa/yvB+BMEcfjed5CX3X01vxpxtlHIt7aVKHoqlrRPi2e1Qs6uV5JL3ovJPF1lHhFXJHLYMb5xOmk413FZyTDrbTaE1IjNvWu2Emd43MS6jLRI452puvQTf9A4v1w72C0y9pJQmEZRag5rpJtMCt3mNp9/tm9JbFkxMa5QprSUPNc8SpOuCN05C8wzGya6cwNLhAI5OdHrXpf/ExgZsGEeCyJDNIfDNlE8eFEobY4+v0PbCp67oNJDH9EWnUlNDrqEM0czXZjAqhDhhlZLOpKjQDXxKWE17aGgGcSuU+6+BJshfjrBY0LQRKEUEOzepQCBZo5KguvPYRE2AB1Q5xp61HK6hVmkHhfZvxNAUryrXb2weSHuPi+kkQok/hAYFCR2Ew81sef26uz9u2cJl0XMptSfJAvfmagwofiU3jqLSDlKoUsifouz1sxMydfr06JLsQgkDnCtjZesTd7yoqjMG5WDfvtJI4Zcu/J+61AZH2BW0Vfb8NaFt/HxrvcZvr1/6pzXmWLMEElh85AxkPsd75nSASqupr3k84QkU/w52nr4U+MmwNixWNqAIKcMuw3DVTe+qDKzNdxZcklCAXdXOcJYymrwGqhkA2FRJyoPxRuwiGko/yHOMqrhXguKdo0IZaKu8SUAAVVexMctMq8RJnV/mStbwZKP1b3/RnDJ3I7pPthf59ofT7FTFG/QdGrIlO6dUu/eVjTZLntJSbVrShQZMhosMO3OevdP6HP41s3mBCWaseLQbqc8Ox1BNST2xRTsreLX5Y6fP4z8Qkjjytff4lHbU8rMoG+gp3W X-Microsoft-Antispam-Message-Info: Sm3inPnYgNZ066MZSF8HJ0eeZ6y1JzpBXpzSkytnwHM7HULBAhsILFw/ceOWt7ZN7tAc/W/m9fcOBRlzf/VBBlXT3Su9FRMMj2DcXUQ8YKt6Pn5MVQbq4/URtquetgaQZqo6Aws0ac2Z8v21QQ+/veDsnIXzFGF/pwtSAeT9SxVYMzOTebrTagWkZdfFjy+w X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:NNEPBaD2G6Xx/xsc2RCm1auTe5i86zgjZP9eOisykImuTurcfZN3NyCBrytX4k0j5fqJo4rUGyEe0IJmOcJaOudiaHharItVD+RiJLppLeeEMuLfR3m3djA+eUIUFa04mKWbn2+9Qd76OiQNGKZbEhno/DtxnGHBJXZpKhUKNFED+Yx9elcfqyLII0/ybZevsijcx0Wkgg8HDWZe5BE4q9azfy80eP2nHQ1lQVtxP7e7w18BxZLyIpb9Qv1Th44bBPG1qbCv6flj73hCHSfBRAhj9ZLJRmnw1Rn+J0TH+2P7qn3BHYBVEkVaMW5wL99j6XOiWq9aKgk+wNdJ1dvw7TvX7CRw1hN+8/2EPAEaBBBAxRTPfNuQaH4LWGzpyEZFozGpVDrHzU2wTICgvJeZ5cWl5dR7WWd6osnnV3n7kkzLfqGGL1xT5lHW5l+OgIYO5WTF9ppF3MJlg/7GX4Q1/A==; 5:iTV+9IWxiTapOw74rIiEu9o7m9zZYu3J+KmNMYd0ilFtoq46AJl70qJbj8iSce3HyreQ8dCBaaGp7yNLAVQdk5BQYkOlioQdrkUeoIZbeVEdlWA2rVgh/nK4pzgly9wqwREx0ulR0p7syvZ0/38OWlzBoluUWgt7h1zEne+zIYE=; 24:zDQuZMPBIz2Z+RW+bqhCLV4Q9cc6mfmWK5qec4LHVMrEjjR1DeUmZP4ZxII8mGGs+bxCw5fEG6KUTFMAJ2POlgMyvK+QEtEzFLmVL4fLBTc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:54B0Z06/ZsZOH6fFFSfZfipaREGnXXEyAtoU1n7y25ftKFJE5baYa1gUZuzkcb+tmw4slRC5qsN4YC6Fe3bd3/I+n9fS5zPh2iclnUJB0kZcGnBfbH9xDDlgufwbkIqW4qga7tILebCsKnetJdCJchReymiLAHKGsg5qP6MQbpRGtgTgCMfFgn1j0H5wYb9nuHEwVtRKaEZ9tn4TuSJQUFIexkkGYtY86mVwuhWT7ttRkJ0J90/ebsLtE5gPIzk1 X-MS-Office365-Filtering-Correlation-Id: a805cbe9-a95f-4133-8ab4-08d5c75b6259 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:44.1435 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a805cbe9-a95f-4133-8ab4-08d5c75b6259 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_180335_921885_E87C8B0A X-CRM114-Status: UNSURE ( 9.37 ) X-CRM114-Notice: Please train this message. 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.83 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: 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 Swapping between primary and secondary channel will break mesh from joining, hence don't allow it. Signed-off-by: Peter Oh --- wpa_supplicant/wpa_supplicant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 847cc1d..005eacb 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2192,7 +2192,7 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, } freq->sec_channel_offset = ht40; - if (obss_scan) { + if (ssid->mode != WPAS_MODE_MESH && obss_scan) { struct wpa_scan_results *scan_res; scan_res = wpa_supplicant_get_scan_results(wpa_s, NULL, 0); From patchwork Fri Jun 1 01:02:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923706 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="m9+Efy9A"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="lUCRa8AO"; 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 40xmQK0MvWz9rvt for ; Fri, 1 Jun 2018 11:07:21 +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=I3zWAkhlIi0B0PtuhyGtebBjD1jr/h/LxrbykJh/gCQ=; b=m9+Efy9AIAELlP OwCYPvhhX+EIng4qY9ZGdufphgIZVt0WSKC5DmTHR1KekKomHZFgy6ngpjj6N2aCmLg3gvjNCva1W aBIcxVjh3SaX7ZWK7wzTFu6nrZy/7WCFvcPfUZMqYSC1qIFVEYJME/YKAKW7Sgb0HTAV2gvG76E1q fE5YlsZa/Z8zDSxgAVTrWecqozuhmAuT/aGS/LR14galUZO69B4eOud0/exPB7Cn4M9UV/6wYkbs0 ByfBe6XzfALkNMKUyRc596e6lHsOdxai5PueoZCp7kuklKKaulUNOJ9+7eHjpkUCnAXjNPAK3+B5N KZZnSdHa98r/4RUy2Edg==; 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 1fOYXC-00048r-Qa; Fri, 01 Jun 2018 01:07:14 +0000 Received: from mail-eopbgr40056.outbound.protection.outlook.com ([40.107.4.56] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOYTo-0000R6-B7 for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:03:55 +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=lIeT0owVYhluaPoL/td/TbbrTXP9fkrrEOqxpgJo2Gs=; b=lUCRa8AO8wuVuzFNrPkZVvDA2MYblKufUdBq5+WVA03jO4Exa65hsUoBQtOa/YQy9NvP2XBkG382XJGbCu7w33Jw4f4xZOCke0zS5q5gf2r3M4EE+sYx3gHENU5IkoG3d4Q1tusxIEPjUdHCawOMJWhi4C0b7hSSS/mrXQYk+0k= 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:45 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 13/15] mesh: do not use offchan mgmt tx on DFS Date: Thu, 31 May 2018 18:02:07 -0700 Message-Id: <391e68c7114385ed4cc14e85347b38e64e00ce4e.1527814610.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: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:uNHVJdY9sZ00ORgFGlEtiI/+Hu8wDFukIZ+0ervXSp/pRijf0FzuYo4UFqBWCXMC3doWyRnsnaqUlDC7DdIp1t2QSqydSdWuxRXmIXu5PUUG7r9N7OiMtV6m55vYIvWDtm8Pbe0MMb1042KOCFYXDvcnjIpOi0weKr618HKmSOii5FRVhi9Ej3S6NbmS0JItLUMvcLep7SkH3/nkTiZwUfHIwU3dDiHN12PqXxHc1dRtQZ758fDtE54e2GWD8iMU; 25:1m3yzZpMqfDTRzsA3POICSbZdmZSEBlR/vhjtnaZAK2NL1mbqzDkNsh5Hy4WqKEJ/rhO/x9McxedcNyGN6PoBjlVi6JCAiiTNMOtqe9hsv6jfbnus2NAHIILe5IQx0oSSO1VZunKuVAXE7WYba3VAbmLMXwSudzWiL06NnMdnBy9VZg0VYFnqHvx76hsu5znk6eiXQY2TgMrw8qNzWT0rwHs//qc92oVPbms/eDnvalpckfWv5D4koYKH5xfKyHif/Edq34SgT7DiBVGQXxL5PNbugyahepXF7HrI6DA49Q58O2sX2fpR71PBj8lgYiMejVzcoAGX6XMZl5+JnaTSQ==; 31:bMymiJU+FlvLNsX3vzP4on0RMoW4k34W3PByUPus0yxCr+MhYXyM934gXAnST+B+VgcpopFtE6Rsno8YkVwHXgdfR6GHFPAIf2NPFRDWnMmTY5lHNIfWGclD6euv2xyKFCHeSNT44CSyAX1CFUEG6b6JrmNE1cNcz9sl2Qct8IU4/275NWKU7Cd0zPfzuuBn9ZC4AiiCbtZTqf6SyeBb7q4QxrPtg5cATDiDiULqY+c= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:cK362tlOQ5jK6/dcWQ7h5fsRODbZvfXuiA/m+hMVVh2cCIQPWpaGxi+8ShmVSeixvxPl/4UaUu3F4Tn4njBRev3M/lvvzrkf8yN3VlZ0ZZrX8WWKwmDXdt7ay6i+xWX+42JWWpl6g436lvl781Cferq5UFfQtWhKC8Vr4SGgZkKOkRjyKeS7bgfFkl5nszpaT5T+Mk2h5M7dXD9O2xrfTCsN4Cs+R+yYHaCnqYFw+V1KY7TP2COuWGGz87aNH6pQqBGLrTV96uebvuJ5d5e/GVvgL70qgJR+oq9RLwopUUTtY21parpiHA+/NYNCspSfa/Dc5BX+gYHiM+bbJT6W7udGkjRbLojkjr2+zDfJWxVGASLQV6sR37a9qTaWNoV4Lkj9baQxQmqavT3WOcPd49NnXY722JPnpBjpjbFwmh4=; 4:cX6Vin8RtAKtJcRIhVEhpZ665wy5XUJ6Me4Eg35/IybO/qVPxT1ROH0Pi7vF3PYYYmht39R8YOjZ/VIzegRoZWSrPCa3MBi3Ceifx73QcW3u1C7XGNdVPZdlWsIHlCr1s4fbOPZrn26gZR1Guct/8hTRMa4fX3THtU7P1nFCAJmDEL+r8JuTsGR/hONk59dIAx1DEFddGXXp7sLKo1kfna7zENqv40KYcq6IW5tzqzsGPmr7qHxIJluKelz9yTPPXPuiMGjSPvRAbPk0Le6qBw== X-Microsoft-Antispam-PRVS: 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)(59450400001)(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:lT1ZQYGJ5dHs5Kb8hbujcJBx9jHTPV98w2JJbIu6G?= v9Vwb1+OdJII2utFurOgrBN7VdTw4G3A/l1qVPx1bwzChTdRoSBq5Bd83zsckcs1vw3aS+tSxg2t9kWEBXX6xhCIrnidZ4W9iV7WvoVZRPlMqQWBvVBYqv6YKm9I6Cxs+sPtJbRv9RyeDhYvBqQ0lzai2OiXQjEZJe0tqnTJQwYDWNoIBM5Nk6C3ZXBa1088tYw7bwe5wqLs0BvebsyGdResRLaNioYE1EGJNqpF6x29lHioBxY7+TTAoT8mcMGJP/f9xPnAWGIq3kshTgyIa3WNaH2rmm70IlQgsBAAC35Q6DyhjRLrhJ2/BPh2DUVbcwIanYOjMX9xAXIOXdaMu13ZIZt09PKNkCVXjP5FdxJe3vPXeoLSkTtPttiz/zplX9Q2ueG9Y5SAhqlEVOQf4ujXWq4OL07tUdD4iv+3V0KVrD8ww3Qj6Lx0CXE4rAknkqYCJRDoREux3C+RHO9pk+sl0GvshhKhvUNc8wIfRHis7lpzaltdiAmnR/ymEqEl5UFQTbQB6tCzPzKkyQk9AOVoylbPKD9xd9rNGnQzMburUlkrofGdDmEa6YZ7zR72GTvWkJoBbURRKNFr8HRbj/gfHxFSDacfsE9/MFYaqC19AXRN3moNzlrkgB8dKgH4kqg/GgjH9HAmvoapJkdCa6jwAq5LuB04PTrGurOEzSGhHqWlTMwV5PWGbeqr49jh5uhMLlh1lvGogjiauwkjtNnlqr4eTMHvm3gHH/iTtOgq7Dw0B2iGTcEAECvG+1Nzm5vXE2myeCw3JwjxC1+7P8fIgWA4fAfe1R4iaraWmkTM/He5ri6VTHXRoeuV/rjww3gvEruvzAYhFsG7uoNxxMalfYZ0YTPXYnJnRYRSLxkgo67r+Km//mwO5Z0/+pTbNzsheeWukd+SO+UTyjtTGwgIiiueA9OXNNFGuI2SStxJH3LIKIhXr84lxP8ATyO4yfr27eFBFNgZw9uVVUeLcjrsdiqdR6qMrLOqNra8p4rWIUQrjBH0knnNyxjuWJgr2OMYWf6SjNxrl18Dg4PjveWtAi0m8xDGkXtceqUziWYD+/ge1o536kg8FkunekakyKCQtYxIehRiNuYIHncjaAFGfN1JUemPpCb3wFZGbMaLHC1AxMPbOJo9PQ2KLdq5O79SiKtZ5HjGWG+mmEu5HOxvxEBoakqQZoerwGpUMlfQPLTvT+m2KAcHqqDDRkfV9CA8OQAYn318RDlo0t14QwNpLxh834KRd3mwDVygxJjjianPYq3bgvZr6C2lx/SXUobvydSZQhW9DxTc2uGHzozEgwHBwn+BYh1qOh+YaHAeMs4dAztaoH3UgZWQH9wxn1vQFcrY6/8QRWrJ6VKf5Bb X-Microsoft-Antispam-Message-Info: YyR0VYdChtki8pil+RPfQL0oIM+14XByLIhb+NK3lGYjvlMlx6xKS4OE1Ogmyu76CVzT7pRAWYf7BUWFytq+F8ACvFYc3w9nU2VLhwwjXkSul5EvyvzNIq1nhwloDncJDx6Z8uzgQCVIGX0bPmKFT1dUR1F7DuGE8xXXrYocWwFobXE+9Hkw9Giyaeu0GwNZ X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:mJsrvQTYXgKC95igqlMqa5KLZmpLcnVvnYgjrKTPMCe7a60OpIDHb5xQPwSTuHvKBWCWYTcXXZdjHesCYKiGXjUs09jJhNQRWLEmm7kIYqmYvGw3IBkdJLHA4GVRbAdlQDwq2fnKhJ0Gu0BVSBYyHgEQHblx6JlZn+KSo588iyGDUPzZaW9vX+YRBnMJXYys0dN2Yp3gsVRdUEU36W0QYsM3E5MC73eFQigs/KBFAY6Yb6Fs0RgG+HvM8pZgDiccNO/NgAmhhNlmOnFDdDNenZ9dXXwdDI158MYRc9DJUy20UBr0Js7iC0xk4Ok/+1hiwZ6Mb8BBQRi9Nweq5lOhogWRd7sUEZGKsYtLK0AqKyDK1pITZLkbmWC76Shjm6H6w3B6fY1m2NY9J7thFNAuuvWK8s6u6brr/4tc+I7vxieQyXjr/WXeKhMIFQxxA33fMie4XvfR5efPWa+3doA1zg==; 5:BPbcSHvxMmDb4xdizB7rodFArv3bNwVOaOX2Z3YxRA5mZsQBDvttGLQhfFWkh7xRIlEsYlg3E/sf1ajN0OG7/z2i5bjW1C7dIWuBH9DUMpr684yQt8jLIjpiRC25Iu7BmKSSf4kll+QzOSxnG0ADYXy4v21mEqDTze16ZPbOJfk=; 24:6TSbSoR6RUvk9pVAgzlYRzJnRoEVYZ5qAz6UZOvXUyQNrEyTA23Q71b1CCI3iaBCeOlXCBT85To8mVOoYiG/t3BAUO1QacuMeUQ3XBezBLY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:nHZ8rUzf0K6W8zIFYScC6CSFIJzRaqKsR8NLXfNvytoAOJvuqJ6SrHq6wDfFFowX/tE2fJrcxBLf83o+I/o5GgfbK6Yqtc2SYjRqs73cOs/9ik5wEiYLu+kvPaCojx0nH4BNxfky3hyA4Mr3V42PZv7c8WN0nrN0EmkEBAbUmKq2rsXS0dnbP7YAJqYjGb/TWAoMNJ/9u4CcxIO5CkYcY6Rd2K4h2Pcet5uU4IGonnv/VyffdpkdN+slG6o4PeKL X-MS-Office365-Filtering-Correlation-Id: f05d0f7b-6da8-4982-f845-08d5c75b6347 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:45.7061 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f05d0f7b-6da8-4982-f845-08d5c75b6347 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_180344_450583_8F8E940C X-CRM114-Status: UNSURE ( 9.22 ) X-CRM114-Notice: Please train this message. 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.56 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: 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 Drivers don't allow mesh to use offchannel on management Tx, otherwise it will fail and return error. Signed-off-by: Peter Oh --- src/drivers/driver_nl80211.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 5cff47f..c1c641a 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -7166,6 +7166,10 @@ static int wpa_driver_nl80211_send_action(struct i802_bss *bss, int ret = -1; u8 *buf; struct ieee80211_hdr *hdr; + struct hostapd_hw_modes *modes; + int offchanok = 1; + u16 num_modes, flags; + u8 dfs_domain; wpa_printf(MSG_DEBUG, "nl80211: Send Action frame (ifindex=%d, " "freq=%u MHz wait=%d ms no_cck=%d)", @@ -7190,6 +7194,13 @@ static int wpa_driver_nl80211_send_action(struct i802_bss *bss, os_memset(bss->rand_addr, 0, ETH_ALEN); } + if (is_mesh_interface(drv->nlmode)) { + modes = nl80211_get_hw_feature_data(bss, &num_modes, + &flags, &dfs_domain); + if (ieee80211_is_dfs(freq, modes, num_modes)) + offchanok = 0; + } + if (is_ap_interface(drv->nlmode) && (!(drv->capa.flags & WPA_DRIVER_FLAGS_OFFCHANNEL_TX) || (int) freq == bss->freq || drv->device_ap_sme || @@ -7201,7 +7212,7 @@ static int wpa_driver_nl80211_send_action(struct i802_bss *bss, ret = nl80211_send_frame_cmd(bss, freq, wait_time, buf, 24 + data_len, &drv->send_action_cookie, - no_cck, 0, 1, NULL, 0); + no_cck, 0, offchanok, NULL, 0); os_free(buf); return ret; From patchwork Fri Jun 1 01:02:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923707 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="D8zi0qQn"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="P08dfpa7"; 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 40xmQd3qCJz9rvt for ; Fri, 1 Jun 2018 11:07:37 +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=wyz5zaFHEut6arIZNzZBm2NO7xq7RwBqGNioV/wU1Ms=; b=D8zi0qQn3qlnVE 8MCgwWSr2pYVqIAcjuqGbQoYGBpPsf7JmQR/HU0TijFiI/xzjQU3HM22goCZbAX+DGhXCl8V9aEug 18eu+jKlxOdxuw13GPB4OBlhvwGIVy+U/mqHAIGy0NvsJX8R95exow9KjUFIKxdpc+0MQ0RVRUtmK IYGK2ZUylQ2S4bYArl5BkH7nnIk0EdPk9pRpIgYyPCXZid36fMjHcx4XnRWnKdKRQpvlRgc2sT2oR x8DyYU4/s1iUJZdfdUrTPWsFNv3FyxMtTlRjc0aBuKglWLS6ci5fQXCrrDZXo1ayfudORNMbA2Cje I4HshenyTFWjohMv5s+Q==; 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 1fOYXU-0004Ij-Nw; Fri, 01 Jun 2018 01:07:32 +0000 Received: from mail-eopbgr40083.outbound.protection.outlook.com ([40.107.4.83] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOYTs-0000PE-Pv for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:03:58 +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=FkzAjMg9fzmC0K/VfP4U2CTVkd1waOqVm88MdYFhW5k=; b=P08dfpa7iV/MY2KnnPQ03oMMDluacJyPw0OIxCHOu19X76Vzfk31a59o8LUxY04CYDBlV/GQQweRWs+BYdjpwMxfHYTVb5jEm3IgMV6SijYKd18U2Scsu7LwwYYjRZ/SWPXT/Tg5+PjCLfY5fUZ+cqN8Logoqv2RJm5RZ5a60Ko= 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:47 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 14/15] mesh: fix channel switch error during CAC Date: Thu, 31 May 2018 18:02:08 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:doYyY2/6OUBmv/lkRjkiG/6mGqPUf4Nholm+cR5W6MgxIdweVCLGG8lkvYYIWWxqidBXOM/dDkIDx4i6CQ7L4798uirb8guFQgUvNUE9+R0qg7CofuvWHVdcpy8343OPPJvjDBMbdorrCpR9ngpZkKzkGvAXYufvkBNi3XYRJmH6/hCLIztZWy0iqCBlc0eLiNa3e/2aSacwwTI1AVe+kzB6nfh9vOVpbOHQLQxmCvxowSO+FODHXxf9zHx2NIed; 25:Vqt8tIJWBZzfF+FGEtlvSOFa8vsbUkBNlGkCzchMo3yMjVF7+xf7Hr8QS9F03Qd7czosMdMCGu2mDiuOmX5AP6Gwg3JMnxI9VijGzqBfv1ZFhEW4s39W8V0ezrLlOVPyW11HXsO7+DqxAkaoEUA1bwJS5Oq7IblZunLcfB/bfUIkNRPiokqMpfxF9I/qvMrhU0UZg4vNfrRanerMYdCnw679e6y9qGiNKZi691vmUZ5+chZv2WTvC0D0l1CJ+c0t02B4V9VrvJm96jk9eiKNoSyYZqhY9NP6EQKDE9BYrzG7+7N/jfgCtO2FbGNNVdz1SevYdS1CGX6VstJhKWkH1g==; 31:anlDDBsV+8NrOHIwfFeesWrz7H1T8AzmmQgL6ha0j+sIDMRMY+ALKy0DH0jFZqIS2i5MrpZaTGYz9HG6t+YFKb+t9YY2Uifp26M566soiInxZuXNSND5cW+RKbwLpNJlWJfqVFr6Sj7xahXFYrK0WQVY0/7IcdrIXKv+h+onIw6TaPZ+r0q7MG554x0qxDcBQf+5KE3umNtp76Wvt/rY6/Gj0aV+ghr/IGmtfQoaNPw= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:EquTyZ85CZoy/RG4FrKvHDUCp5eQSh0b6GRV/Pv17jhY986SSHePunklzkNhdQL4XVO+BlPTQJl953oZ/Kv3UbwUydmrhR1vm4x7Hy1M2iUY5hr7Cy+JkLwPAG9lo6ZxthHDy8NaGIKgjAsTYid6mr+UzwxCgFpp2JPetkq6lK58uSPvtP2Pv9FuWUQJIc+2O6KeuDZ2RiyaxFzScBNP7jWzFzbnKPTIEgIJPlruE5JMI2Suif3sJdJed4gQUxvbP722qEqt+VsYzTd8DSbdKI2Cs6j1imFV9BqP1+zyPjVvMKhvnIIq0DAAy1bxKuV7esw+gREernNjV49frm9Hhg9SQRF8FKdkHeu49BQ0+bvlLflWsIyCF06tJMWlVme3uCE7PYSCW5KKQXhgMyLqJVf9Y+kgaS68O+d9Q+nzzcw=; 4:hDXFVgIvqvwkbQ+9dOrb80N1XCiC3eE+Z20K5XzL0+37HpxwRn9hI7xe7tFfj8iPnftPMdnXB56Ab4gS1Ei1BJDBrqIdia8hZi8INDObNYLnWMRuB3DaniRE/3HLVFQAdwQI62w/7eR3SDkVdL2jGgIhmFkbwHwUwGtoaipk6NuyeD4Kppomg2oAN5/zFsGMA6IA6Ji8iTdJF3hSWN6p3JQXS5O9A/j4PETFXJHfLCPKGnR1ET4clBRbPTyYacBBJ6WRrquzgWGCV2ozkdPWvg== X-Microsoft-Antispam-PRVS: 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:OWzerGrhAy22TWcYZptMhURdPMiabyapGtKDl5c2y?= CC8GrEPhuFGQIaxDBqlwSGcnz7edjLjEzFc49h7t4j6Srby270976gQYtlP90E2wg4LzhN0aePNiUoY23KBwecpWPnUmxn7wqu0TSThSMOf+XeBDQzA8OJqxnNsDlCoqOOM5XbnkGXTosHI+Y4yrgIC7RzZ8837Y2vUoiu/Q8tDgnvvv348Gb1JbtMJotviijV9sOjnfkp41iYYjVbA6vBjZ6pWN61LFilBn0mgdBcigrDe4ZpsZtE88ybu/yHgwBL9YeTGcIJ6S1Taf7xwqRxr56M91PZmVvl9/axweVlD4muGmI03zRlFLzFYAcsNzKqUAbsSTr77LKGhJnoermhTeI79LqtBBrdbNqcU9XMzvN7f/kKutjf0RSST4MWib4NJILmzfVM6IaR6vOMP44EV5tfeks/7FtzklsdOP+mriAE2TlqOOpZjChEiV0t8F3xKdvPo3Y6DE0QaT34UKE8VTa16tdHTnDU1frQPJx+Y8dKycnLpD5z6ItjhsqBPNRiZn2FmwS1YDfxud5/epp6BtzUNZlMgJh5eiaOJ3v/Mesd0LGwsuLbz1ECkoJOOsbRKei0bJwVJLCcmp63Ew1445sw7YN8PVmuLdVB+dI5UkS9R6kSdTQGklymMJF76c/AIWjKFQZnLefSwWS4CPsVn3JQo+QeDKI6SOXLVqdl/ok/NUIK9+ouCYCeKxMMC3KKlZo3gGIweAlke2ARErN/hGncmBCQjT24Tqo8U45N27TJqN/6vh4pnpAeHw+Wcj8A5Jfuc8SBoRfMmNej9a7mepQRVnpCH27wopmHAA4qASiazQ38ccv94GSu5+9m9FrTdwjHLbO/gGnt/lD/FfAyo/bBwIJHSF8SUIgDKqE1hCJVrRgRUmxuJQmK76EsrnsNEYBHNCf1Rh/p7mlvSQURm+OH8FQru9qKRqgzbSdwHQD0TFOfu5Jk3iYAdvgS+zBIjHUtaVwrrkCGFvwhHLiJAx182bo2nU1889loj+vvjGb0AsfM2M8hTyr+UXTJo6pUkIsqWXO31/NG/X5h+R/IY0ka7ZBJxZlinbOLucs3AXsyQfz8h8MC4fG0+d2u6Vmk6Cj+UgLIIVESNDSV8EynqRVR5d+1NKA2KI9j0eIgIkSRkCqkPVWRAme5pXEzWG0sh0rXNP/vkTsa3dMPCS3Z2SdZKjOMFV6q8A9UphYkp1MnXC2/Cq2mQ0ha69dk9CFQlftl/jpBF2wecd5EbOQC8cmZM+tDLKHH7v6+4tDg0UsW8gHcFCjZ7fCuhxWXba9Zu6R2+peJtASMHkuFJFSP1pY2UKJHzVbtew6U0Wwayst3lgDpOrwO3yNwF1Xzu5mc= X-Microsoft-Antispam-Message-Info: QOiSzeIE7xChimwjoOnXhX/FDIJ4KLxuq9BO0HoS0C+InsNFeSYfteWoe06uPWNNG9zoiyNJ/kgRpHynZM8VPtVbVuqfvfAtLwNYvg6iCvbBKeJzbymmGBqNXeMZevqw/anLT4gy9sO/JSkIq/esJjBlAx5cszOgOw1wihoe2FTQMiY32LAgFyLsNds0b5Aq X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:qWhahD3Ok9zpUT2fHT93bGmhP1TqpPVvMGAlb0ci5IoGzyg9F3PVfvHKOhlLNn79yYh0NbOs7nBlf66eEOSXs1Qde5sx+Mzve5gy5+yvO6Ahzthl6zFG07cm3JvbXODR9hf00ORoMdADMRQy1NssxkXIvi0QMAA5Bbn3hf4sB/YjMJteQ4g2aMCzEqjPDCoG3/kh0TNkyv8SmCplpL6SBT8S59hiWGfWD0Ny1e/uO0EIu9RgFcpOku6WVo+o0tEXB58s2Y7PmVvNnUL2ykahjY03b9XkZ7eliMiUT7xniMUOpE0+aIjmN4Tw8iB2XLZjQ0UL6aAT26rd+CQC2QPmSTTrZPaMg88uSwpahtUf1RrgLfh5oOfvcofn5ZfavpRh/m9Tywv12oPbcAi2J6JQUzrwaliRa28kWtOvAlZ40mjcwbBE6QtYlQQbffwzUmHJ/fRd1dNdygKmJjkZUcyM7w==; 5:+MkKdBAtJ7aDmelIizC1Jm6O05TyOjfL/EvbfWZDbNZTSVj8V4lK6ryu4Hv7C4JbIA+FvJKgDkUJLjDukjOwbfmQr1UEpuoY4gPf1gBGEgc6qQsURDRlrkbkzUmPvk4mjx676eswHRgGwSRnV/kMuKfLpKpYx16l1iNLSRCr2ts=; 24:um68zIiu5F+GBchvhZcyYS5Z58zvqd2Dlux3PmUrwj1OlwFf4i7Ja5dTddBBugvS1u0lwm9zWehWOovbHiIl4DBJcbwudaEV8BYn1xh9X0M= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:Y5FNxyvw+jHcKF15jjyLi9N6Fvw+DwmWC1U4M2cLIVh25JKUnozaiaDDzdx/LtPu/N2MlqAbJEW19Fu/Sg0W+cStrfu1cTCW1kz/UR9dpw7/K3OOI7qbIMS9tnVw8R1q8sDdlK5ymycVNVWGd7IjRmL+uvcI/b4Cfb2BrSkZswxrGxUx4qmeQdE3Dug/MlYuCQzz7PZOtJuzPtHATSoXCyRcwBp6tQ3NDGJ9agTHCl2jn1Mme/tjgXZu5jVQz+hr X-MS-Office365-Filtering-Correlation-Id: 437a2182-6564-4e54-66f2-08d5c75b6417 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:47.0655 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 437a2182-6564-4e54-66f2-08d5c75b6417 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_180348_911996_F8F376DE X-CRM114-Status: UNSURE ( 8.47 ) X-CRM114-Notice: Please train this message. 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.83 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: 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 interface has used its channel parameters that configured during its initialization even after channel switched due to DFS radar detection during CAC which caused channel switch error. This change fixes the error by updating its channel parameters when channel's been changed from initial one. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 3cbfcf3..eb36ef8 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -396,10 +396,35 @@ void wpa_supplicant_mesh_add_scan_ie(struct wpa_supplicant *wpa_s, void wpas_mesh_complete_cb(void *ctx) { struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)ctx; + struct hostapd_iface *ifmsh = wpa_s->ifmsh; struct wpa_driver_mesh_join_params *params = wpa_s->mesh_params; struct wpa_ssid *ssid = wpa_s->current_ssid; int ret = 0; + /* + * inspect if channel's been changed since initialized. + * i.e. DFS radar detection + */ + if (ifmsh->freq != params->freq.freq) { + wpa_s->assoc_freq = ifmsh->freq; + ssid->frequency = ifmsh->freq; + if (hostapd_set_freq_params(¶ms->freq, + ifmsh->conf->hw_mode, + ifmsh->freq, + ifmsh->conf->channel, + ifmsh->conf->ieee80211n, + ifmsh->conf->ieee80211ac, + ifmsh->conf->secondary_channel, + ifmsh->conf->vht_oper_chwidth, + ifmsh->conf->vht_oper_centr_freq_seg0_idx, + ifmsh->conf->vht_oper_centr_freq_seg1_idx, + ifmsh->conf->vht_capab)) { + wpa_printf(MSG_ERROR, "Error updating mesh frequency params."); + wpa_supplicant_mesh_deinit(wpa_s); + return; + } + } + if (wpas_mesh_init_rsn(wpa_s)) { wpa_printf(MSG_ERROR, "Init RSN failed. Deinit mesh..."); wpa_supplicant_mesh_deinit(wpa_s); From patchwork Fri Jun 1 01:02:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923708 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="ci7A9zw3"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="VB9oab4p"; 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 40xmR15D6Bz9rvt for ; Fri, 1 Jun 2018 11:07:57 +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=U0sXNW/eanZKN7HoniOrtcCUOFpvdEREFuXidf7GeNc=; b=ci7A9zw3xcNIF3 yFAcyxNTjsBfvhTMYFy8sZ6t7FFSgCNxLpHaGEkwwv4QafSnEkrZiW7ZgfcWviPxV+M0fI3yGCqv+ ljHrnHMrcOyYQT7+0MICO2VlBTIm54vKsBmRQjqk5Y9pHZjoBkB6UG6jBXHtVsvCiWvyDqvoCOzkD Vy89cXSoK9NUmS3NbQauP0EemrG2UwV2K4t+mENtjuMDpsSpRRI8A4I+V//Re7KekPtKbgnuXhy9M T1l/j0oZTjeex9ExQnrez/xVgGHWDxvn6N1Gc+/GWY6LpWBz2Wo8GUhfmNljv3e5Kujstl8mGh288 KKK0Fmovk0SASXOOisLQ==; 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 1fOYXn-0004Sd-7m; Fri, 01 Jun 2018 01:07:51 +0000 Received: from mail-eopbgr40056.outbound.protection.outlook.com ([40.107.4.56] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOYTz-0000R6-Q3 for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:04:09 +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=wz24VUIc0bZDrdVvsv8D93Cwg3pUdTJ3jkNkxkRWqsg=; b=VB9oab4p0htCk+CntVOQVg3xizodkBJeVP2zdpLfqRjtQsGsFXS18tq5GSpXNdFo2kDyRKYZETjTftgIlR6IiLu4SQeBIsu3lS8UteEc9plUfnVtWgnWn1dDD5VbHOOZjoBO1g1IC7IO5dEb1NB8LKkxKXo1S6g8sLSECsyxWmo= 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:48 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 15/15] mesh: inform kernel driver DFS handler in userspace Date: Thu, 31 May 2018 18:02:09 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:LaFYxDj5EHA499q2d2gUdAMgsnbdKlk8bIM1IdQA7wISRENDfT2wJHAVHvh3SoavKenvtkkfIL0ECdRsesq8wsaMvwxQffIwdljH1Uy1/LpEZ0uGXAIiRhi9Kqt5R3xBl3sFNL5xR3TR/oZUjmqpAmAu6E2Ii0fhyBfQ6L09BR2frx32IyWnTov8g1o0zsRNiNCVJ9EJec2F6Bpbt6y9Cm6bWb5B2/VPfUPfHYcMFTtaSWvVkfEYm5Wa0f1KVa4Z; 25:ZwAV5e3tFyzAaT7MM7TXJ9vSJx7s7aIpr0437u/29Xlkbofx/Ylr76ubOnsbF73aMKk+YFIKabX88GjX7KzCMcu98rILKQhl3GeNBv1jK7MLyscTdbEVykC7Y+tVgUdV2kDMX7+nkBeqO1WKLdYIAlVe6pqYOZYKfS5nkIH7YqNWwmxq1SjV6Y4Wfs1QhKDlnWoQzxmCzSB6lf3+O8/UAfCoe4+M3xOpubi4iVFoEK1uT8T+BpFh/PctzLTHSdwvX64Dydl6z16hTE9i4baEa+ALxlW7KQEGMUm4pmgBn6Q19CfboBVt8UNbS9A9/b548Al8zCrr+3ricJXL0L9cow==; 31:zwrXldYfBEDcXecsMNUjaxEVxhf0tUMUKOzJVIYKdX1KglWzpThSFcc92yh5TtzxZCVO7TiPsBtNd7HdUwUkZNFuMOhqlByt4ttXTcjr2beiYlIsq1BdvRLM6NEs07JylqWdeY6FIzFO0k4OG8nKzDDika9J0EgWDWziOL8SVtzvXmhMzdV6MNKESNs5oYLUcfYHzp2/kA/QiJIHpddaZfTQMofu2TgTHQ1sRvNBcxE= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:FhsC2dTAgTMUrwWQpNbR88jFPzwZ+d6p5XvjdDtN998pJOzjmpm+v1G5ZkJ6K6tlKGlbU0TbRsHk19AUXN3Wnhe2UjBfbKnbXbMfVVZKo/M7vTqXOrBf6mgm4XQw04Q+R6xOH6ahzeLfVMZkwse4Nl5YK6P3SZsASeXlqYVmBSrEbwIfiJDyVz4ZrWtH0CJoVoC0MBjf4cHNayOoFLdob+6SKZRDzX2yKqeo8PNggFXHbvJ4NWhdjIc/hfyUOk02TQC/69iDA+c9TbLIx2y63ueTHNGVLxb8CYHaYvxh8ULqBPD1X2IaC8xQmM7FHo3qC+Vr+2Rul5t+qk636m7RYDluqlVQ0gAECHhGuhsGYRlLa588PQpGOnJYHTa+BToUOsmqXsna7OfgcjY5IdknkJEosI2kZYD7SXmd00WhlDA=; 4:OtDw6dqBsuY8BfIL9IKKHyZ+dKZy+H0GyRPaPr/6EZhm7rrzSQgaSEHs4aOSCCx82E7vguCTMgBdTB7g0BR+wMZSdZ32GaUcPuO1IY5YINaN/AuD/d748dfy1Da3oOlYuhsR7BGioAKLJT5tw8pwLfES9bZNPUQnlDa2pLN4Y7yY6vKpCHPvpz2mJpvSbKCdTB1RYUYoKtYcCXcfYthQwVk8h4K7rAjbImqKFc5M1aTteIL9DJRS52+a/SmJBapV/bBIe5W9CAZasqGfSiGCPw== X-Microsoft-Antispam-PRVS: 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)(575784001)(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:g55KMICF5FhnjMdsi13EFvSFhu00J+kQogQaopuot?= u00tKaa8IfeO4C9f0F4m/7FHDL67aKalavuo0DxUrpZ324VO5UXJ/MzmywxjunMvzAQ9Hf7ptP/h1+40dmBLKT6CFrE6/VxgcWCA6VLPXVB2J1SiNPZCmIUHw0kKbset80hnD0wsqxPCrEa1sEN3rNgl59MC3ewPo3HWuMvL2rAlDV0IExNgXwgY5f7AL9VmvTQA3ZzmYPpJ14qLvoheSitc1XKWMziWS1U935CKuQssufDYQwsq7CLdFJhdVBrnswUeAvqtOmgrL+xtLr58vDV8g9tpQxZEzTcGY9EIG+d43mAqZoiXR8XAAG83O5mY6GrT3yZbDuomCCH2H2gVecIaGSIJuOAmIFyfYSjn8mcR9pYMvKRhjQxoUv0WGAxelHG/gLL5F9ww8qQUBuHkNxg7ksO0DBZ/nacB2dA/e47vBvoSeIhjIxkRSL0BIYMmxFGY6u47cFlN0pD8QI+vwkp8lU83TsV/+J9RP7An0UnO8xUeZlUI0hMnWHHS3yKyD/7qc0dWYruV1Qe9E8XkacE207uAKU1+TIpyRAtTgvsnpfHgMUtoTt7WpVDHmIyTNMGlEuEK7vKjYcZooP9HwM53CLdVR/mDQZ2oGgZlccOMFpLXfwIX3w/WpYUOiycOezoa8JmqefKny0kH+pkG/NHYfNN4FqIwNp90S48z9DiR41N5kgbuzzHNzDoKfBUvDLjDklmJIRjenaRrvWP6HQJcZVbYwKf9xb35KuP6LfqKMfxu6VVqK+fmI9BFsW7EKhXqu57cfjXHZ5lzssmffEA9tu02Q0EqQlz6ee9HfLE6WB1T+kGLkY9pjs+oifowQuL12yfRH7SNNuj9sU6yYj4jPydK2cxKhOFt13lpxb0QSXIDGh3a7q3OBquizzOmypoI1icA7clcpY5QXRKL/q+5qN/oNZkQYRrSCbaP+X1U4GjH4tpyo367VUdYv8+0WYFDPxUKzy2ovCK8hFNvu4Ey5mYnqA+FMfjQ/eXOMePpEi0XBohzsmf0/c5P0gPOQE4esk7qPrF1f5dMs8+Cv8jVrs0GKRXoAVR1SVabwgzhHILQufJMdaGj87jPPm8NoH4ioRL7ErR/JJ2rwUmBNAk2VeGkIYDF6qBY5CUoO+O0dGtz2Wb+FmJBtbcn8+YuM8/3I1AEXEwVtfHNrST4rJleukCRpd0VsQg/a+WYJbJuCsrfx1WumEH4we9XsvrAU88DKBiB/I2LkWFKeKaZMfnZZiVS35It6OQjIWfT5eKEDTesWumiXrigD1IUPSXVXcTIoT+hACXsqNyO7RXxUT1zC7bTS5ohqVlDPH6VVlfogi/sYSXe/iGc2ZNMZbjxt6C6F8Vw5PMT9VifSiatWIX X-Microsoft-Antispam-Message-Info: 9YU4jvJgsAWsY0Lv56etA7YtLWvHiKOACRXXH3L9GqRCbip27BbpUS4zQDgHpeVOE40a0L1GRn1iajK35c3lhj5myc2gTamH5dhiDi6G2J7bnqjr0M5czry3novUqMRmvMAIAqgRFgzoThe2oszrOCjCbEljXcIouvQGy5I90iYg/jLBaxE16T7F+gx3wI8P X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:fxCNOK31lxRoVO4XhvocQCHBJ9O2OFAA9CrY8flwHCxWIoV5GPT7oNC/3ZxkX3eHHK1zDcz80HGlEskRAGR1TiOMujYfjhlz8ex3GmBlVqqibgKbwD7KJ6E44SdNfQ2H4y6hhlU8pBJn3AgEe8yWLUhVkbY2SU9mL776KmmLTR45ME3eB7cdTiC9t/GwGngoi2bEQDz62PL8/KcLIZw969k5HjbrhpLxwkb+lvMTgCSD86AUKw90Fms9MPh+IqLPCJxQW7AafBdFBq3ogRHTLfb/urB8p4HnAAVzywKqKF3Oapy3jb2KrYYSAwErljXvRwP0GNNhnzfN0rAathle0XnHUJ9I5HszX8BOE1eHJW94u6ZggIzBz6psWUXKAdaGmRJm9rOlbQJ7v8QTPdp66tTsm9Fnh0lJdVBF/4VU7u0EvQNvvKqXpjPqXPsxI5RXKBd11fZyN20NMhFUSy65cA==; 5:PfPjyM2xKM1MocE+7c6iowt69WyAZ/cDyodBCXQmNMcs24MfjVTRz5w1g0GuipwYItfcf0MYerQyFxQVAOKD8XHNUkwk5Hg0zi+mB4ex+swP0WDl1Uh+10ewOdqXqc+A1D9nv98BNdcRKKiwGcApy8fCpl3gcBUqkEyFZ6iHNww=; 24:meangujDl4SivAVEETAA/+FzOkK8+dJ8ATQe0wFUASrCqhQbeN/I7gRmXwugfUGvR3Z982wjN7L+mrxKv34ZdyfGSKrzKNK5fkhBC5JzrAs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:UGfAExh7Z6gtjCTFcpWDMwhm3QHv87b4SokKzyejz6nAbMAYvfA92cZIiF1ECk3dFXPh8fXg5ExOk1qTwD2LlKWJfpXTEMWNSCGBqlpKPk3ZXWXkKsJe5L0ZffiG4oF+1+CskK7NnXhYSG6NF/8f5EfSNVJDDWtItl9W4pAptCm4bOXSEcCxQbpXjX9knnjiDYpFbPc9cmS9GeLG4sVRhNLj/hjIwPTE+Dw99MaF5fGP+zNtLiVckkWjUSQfRiRh X-MS-Office365-Filtering-Correlation-Id: e7179941-f58f-4d92-7344-08d5c75b64e4 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:48.4093 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e7179941-f58f-4d92-7344-08d5c75b64e4 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_180355_881985_A6BD974D X-CRM114-Status: UNSURE ( 9.07 ) X-CRM114-Notice: Please train this message. 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.56 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: 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 NL80211_ATTR_HANDLE_DFS is required by kerenel space to enable DFS channels that indicates DFS handler resides in userspace. Signed-off-by: Peter Oh --- src/drivers/driver.h | 1 + src/drivers/driver_nl80211.c | 3 +++ wpa_supplicant/mesh.c | 1 + 3 files changed, 5 insertions(+) diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 9922962..8d0b054 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -1390,6 +1390,7 @@ struct wpa_driver_mesh_join_params { #define WPA_DRIVER_MESH_FLAG_SAE_AUTH 0x00000004 #define WPA_DRIVER_MESH_FLAG_AMPE 0x00000008 unsigned int flags; + u8 handle_dfs; }; /** diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index c1c641a..09b5e62 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -9282,6 +9282,9 @@ static int nl80211_join_mesh(struct i802_bss *bss, wpa_printf(MSG_DEBUG, " * flags=%08X", params->flags); + if (params->handle_dfs) + if (nla_put_flag(msg, NL80211_ATTR_HANDLE_DFS)) + goto fail; container = nla_nest_start(msg, NL80211_ATTR_MESH_SETUP); if (!container) goto fail; diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index eb36ef8..32bff8a 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -264,6 +264,7 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, conf->ieee80211d = 1; conf->country[0] = wpa_s->conf->country[0]; conf->country[1] = wpa_s->conf->country[1]; + wpa_s->mesh_params->handle_dfs = 1; } bss->iconf = conf;