Message ID | b19d4ea81b1e4c75eb986c8e734c6c6a44d1a671.1527814610.git.peter.oh@bowerswilkins.com |
---|---|
State | Changes Requested |
Headers | show
Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bowerswilkins.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="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 <incoming@patchwork.ozlabs.org>; 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: <b19d4ea81b1e4c75eb986c8e734c6c6a44d1a671.1527814610.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1527814610.git.peter.oh@bowerswilkins.com> References: <cover.1527814610.git.peter.oh@bowerswilkins.com> MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:f8b1:4178:69fc:b611] X-ClientProxiedBy: BYAPR01CA0007.prod.exchangelabs.com (2603:10b6:a02:80::20) To HE1PR04MB1657.eurprd04.prod.outlook.com (2a01:111:e400:59aa::11) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR04MB1657; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 3: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: <HE1PR04MB1657BF780EED61C996BA580F99620@HE1PR04MB1657.eurprd04.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:HE1PR04MB1657; BCL:0; PCL:0; RULEID:; SRVR:HE1PR04MB1657; X-Forefront-PRVS: 0690E5FF22 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(396003)(366004)(346002)(39850400004)(39380400002)(189003)(199004)(6512007)(48376002)(105586002)(2616005)(16586007)(86362001)(6666003)(6916009)(478600001)(486006)(9686003)(25786009)(476003)(106356001)(11346002)(53416004)(316002)(6116002)(46003)(50226002)(36756003)(107886003)(2906002)(85782001)(446003)(16810700005)(53936002)(6486002)(305945005)(2361001)(81156014)(81166006)(69596002)(186003)(76176011)(52396003)(52116002)(2351001)(16526019)(51416003)(8936002)(4326008)(97736004)(33896004)(68736007)(6506007)(118296001)(8676002)(7736002)(50466002)(47776003)(5660300001)(386003)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR04MB1657; H:smtp.office365.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR04MB1657; 23: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: <hostap.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/hostap>, <mailto:hostap-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/hostap/> List-Post: <mailto:hostap@lists.infradead.org> List-Help: <mailto:hostap-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/hostap>, <mailto:hostap-request@lists.infradead.org?subject=subscribe> Cc: Peter Oh <peter.oh@bowerswilkins.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
mesh: enable DFS channels in mesh mode
|
expand
|
diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 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);