From patchwork Tue Jul 3 23:40:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 939031 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="PcZ/J5pA"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="FX83bTQ2"; 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 41L11f3F87z9s3q for ; Wed, 4 Jul 2018 09:44: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=TLg+4sAU30hwf4d3jWyiWGAcC7j+L4sY2KIrDAe2zag=; b=PcZ/J5pA2QJ3cG XkYIeBWKMLycQaLz4FmbSnMyGYgaD+d7+1EeOzt0mvp++s94/wZKeu8+AdpqdffW9P+z90HmUIDKf PDxVF3JTXl2r5kaAKywP4UJizd0vtJz3o1zSSLYsNgF9D065wieF2olAWVgIVFdo4oow7ZOJrQwgp PKk398BblOMjCJ4gHglU5qMzSF3b7oCUat3tC+ukkD7ookGEOdkHfjqRrE7LWcgXYno35Gaqj13w2 s2j9JMmxGTvzhrxLEzrzEOTPH8j1cir3u6SXXOT9wjjPZy3XwIbZao8ISllutai+jspvGZQWIpfcB PKyXRnMCbZ6z66bRXFCA==; 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 1faUyE-00025Q-OO; Tue, 03 Jul 2018 23:44:30 +0000 Received: from mail-eopbgr60042.outbound.protection.outlook.com ([40.107.6.42] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1faUvi-0007rb-F9 for hostap@lists.infradead.org; Tue, 03 Jul 2018 23:42:05 +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=GoXOyGOB5gExmABEIeX3GB/vFky6zPmxZ/KeWrg1uFo=; b=FX83bTQ2NOsjzopFq4rdcPRCcGJ6qi5+TWh8hrzUOQx7oynQk6jkF5wkVO0pcO9SQqdb7o9cNHhK6vQ1C7wpWGXcEsoQe8ASjdedc8nOfJ1H1VFEpBXV30Y3RdC4ZeWlmyjIi6AqCbUX2jIzzpM8vQWa1ClmtYZgRNQs3x0nN7M= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:49e5:5650:cd5e:e85c) by DB5PR04MB1655.eurprd04.prod.outlook.com (2a01:111:e400:5995::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.18; Tue, 3 Jul 2018 23:41:13 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v7 12/13] mesh: fix channel switch error during CAC Date: Tue, 3 Jul 2018 16:40:44 -0700 Message-Id: <42ee9e12cda956936a95193b2d121d5453df265d.1530660888.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:49e5:5650:cd5e:e85c] X-ClientProxiedBy: CY4PR1101CA0023.namprd11.prod.outlook.com (2603:10b6:910:15::33) To DB5PR04MB1655.eurprd04.prod.outlook.com (2a01:111:e400:5995::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 709c5272-457a-4b15-4e19-08d5e13e76b6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB5PR04MB1655; X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1655; 3:dYFRMjjdT4EnGnv4jkvPpYMBbeoyxr1h6FK1a+DW4DziE0Yix/0p0wq1Z5soARi2REN4E+vMbpOIme9OSi/l1Asigk9XjkL8ceu7a0i5qPJWooVO4fzkixAz9JzAVHrHU8JqeyD0cCnnRc9M3YGdyKAt9VFyJHrw8HErs9SIdpRW8sQ0tsxCcBo1te7LJBqo5ZvPv3vDtO1M8R7KLttqbIZ84vb8tVE3CZqKtZ63SxcaBm1CLJWIhI9hL73FMyzZ; 25:Ik6xNyPxNOmI2E4t7ZOxaVU0ey6bwErh9moZ7NEeYMQEOk3+n+kLjOtDvtC5qOdIJQkxsev+WoI9Pps//4QaPSRckuZDXSE0hlWwaDTbHl9JIMIlmzejmrXN5JQ5yRC/OLblGehhXsllU5QD6v3kvu1EW8oiFGgGm2P+NrR9cwexvRo1/XFTQJnKu1X9LT7Iq2sNryl0ybP8A4N9RtCdcoV1K0NtYLqo0aHJIfm3ungGpZdOPyMYnJQ1V6x3YGYaTdm1pjxqzKTbkRYR+bskQkY9biHXrn0sGqxrfgo4AkSEmgGR6J0mZL5WgQWubOz7+2d9EKm8a/SZ65RGOH8mmw==; 31:e6m4HrT5CyvYN4rGrI4/M6wnwY08kE7YuRcKbF4DzHTbdKwvQi4zsNy1PsJ03u3/c/GwhYHJFWg/sH2jqHZvvjwgumsq6xiOBoRbyPGob3IKKR/AX6v7iVESiJa3QesN6JU5bvsv+vNn5cdwXNsGvAn0SOKTLoQCiKq+vSPtBRRcJSfKZvwYzWZpa9Y/BpTuHapAQLFQcnk9J6wjZNttuqBU7lZ6J0YXf34rSZtvjJ8= X-MS-TrafficTypeDiagnostic: DB5PR04MB1655: X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1655; 20:Y1k5aoq6JZvoDHQETM4aYyrPYn4E/aQbmunw9gcAjGMoJ86m2BQvFNZQ0apj6Lz4M0Qx/1xY6Ap0PAvntvmFA5lXfMpF4qJi87b+twO2WxNRCXIL8spwx3Cw7Daa37EnVJWJL9+kVvoZh+BH7GxO7TzEgfDoW3t3TPJsQkQU8LGqFv1/FITidfNdVlzovS8GsKuT2Xusbyz9u7TwJdWCxg/29GWJ/gFFDeNAb98V3PokEOd/WW1BXXcs3MjqJVbwTzQpjVsmHaJWqDKy3mjt7SbR5psbIxzWezMgHsCnsNSFHVbMfHRtdAzA0CUzPBYXb++k2kj6mLsWJk8iHkRKc8SSKzbGQuHRHUd+7J6O7pfWYWJH/SWRmL5tFbMtAgE+niaUN9vg6aSiKMAmbJkx61TFMnOL6wgPV8ilv7l5qXo=; 4:M9+hZGJnwEW/vFA8eqNMXj2LxxdAXMBoZj8BJLBDhRdebNGTQwwH2SLfaPbX6bdmyp6wKj0Duo4Rw2OTYiIZXZt4/m/HzcfDj7+gtnUytvv96ktmwCeqdiYinzEzr0vf/BLy2d6MUEc6O7jYjSUGQKLryJqHuT+LGY6AxpY7qYyidX1Slz8sMUu2ZJtSe5YBpTuKA38+SBOCAaTBBJ1YmF9bC3U+e2vjsU72ZJR6Lyw3GyEUMBVuDKSQ3+i8Ck6LoCOFtgtwajRLLYBdFqvUkg== 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)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DB5PR04MB1655; BCL:0; PCL:0; RULEID:; SRVR:DB5PR04MB1655; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39850400004)(396003)(136003)(366004)(376002)(346002)(189003)(199004)(478600001)(36756003)(5660300001)(16810700005)(106356001)(305945005)(7736002)(107886003)(25786009)(4326008)(118296001)(8936002)(105586002)(69596002)(6916009)(6666003)(8676002)(81166006)(2906002)(48376002)(50466002)(316002)(81156014)(53936002)(2361001)(6512007)(9686003)(47776003)(6486002)(16586007)(51416003)(16526019)(2351001)(46003)(52116002)(186003)(386003)(6506007)(68736007)(33896004)(97736004)(86362001)(85782001)(76176011)(53416004)(50226002)(446003)(52396003)(6116002)(486006)(11346002)(2616005)(476003)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR04MB1655; 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; DB5PR04MB1655; 23:d4SHlkdIaogRmvMwGWywn8npHwcR9POOp47BLlw93?= 3nwcngHfqaGMippNecX+gl4Nqn8ad3v1BlsTHaIt3icuGiBckGmeq62jq09Jn7SFOQqP7M1JzaZQS3k7fXgNeGhQRDCPQCrsKlkj6uIRNcLXzf0Ae7/dk1n92C8Y5Pfx0Fj+FaJ3/JD8FanshnrOqY6C4suGdx4IkrNg2GiuIDE9wqo8yk1XfVzDHKwN1FgjQ935v0HwePY/QLwy1vNl3pdfHTLbViVuTJbCNiK4bqifM8GpT7mesLtlWjhkIv7tx45zMTurc7cJO/0WWS7SS/peRLvFhAzDHMLB4pXXer+kDZGb6lsozO9mVY8n1Q15XggFXbYOc3sZkaSvfhRvd4rnJHJRutZdbp9XNe/vJj5iI1i19JkUVTfuGCeGQFHdkwe7H9ORhyAgoFdo2L7nv03O1vnyxGihj+ZgIwDDd06Vr2fD38q+VEy+5oyfQQruqFB9YBbsZswvuRrJSrGYAtDK8XCKQS2efv5Uz4ntBM3/C3va0RZ2Mxg0iIjS7hC/JUKwiAYWhdrVgAy7fxgXt5loGZ/KKY8o/uqbv4qLU6pTba9naI025nEJLNI08unHU+EzNyV3aa6zRkVGCQjxq19UhRLSxZQi0Y/h8Pd+VQpaKDG1EboR1U3ixxH3uCMQvdWGP6IRANBKNgj/9HvZqei5TxcgzZyt6GQY+G1OCViOZhJ1jMStqJ1zJRrjRnKGJvnd/2sitrLYN45/Yu5oW9Z97MBIuPqeM7K4kR4tQ2ypeMSPsBEWxl44JPJC2d2rejHYkUHYDKyG4eqcGuqjfvpNYD5uOBHnTc9mMt2ZK/mS+DYJDKgOfBN7Pp2AU2Jj2LAkbHK6d34N9rBWM/E/0QjbiHEKwE8sldNnSY0QRY3xKiIvc26ehoefdQ1vSbEa20amvae+nyM/x8m9bF1AByBiYWEBqmREk73B2n3Fj3wADBrQaT3jqwTlUQ2isUnwk4m4LwVkZDTRckPuWAmAgz4ss12dHOxACACKkfpUGm3pf5t11IeNOnv+l2QpT6kgP55x0yhCK1o2TlFrjSdk1ZlfhPbPrA5Mo7adGBTx69O0h9rFht8lW9mLqm29OpurPLhhPMkzCMWA+h/fSjWKoyfhGUqvxAZLdT4hKOgX59Hd06PNMya/lOFkOLZIY+fcPoaRUgk0xz4pR3LtEPl/nNdYR8XDtgX55YWevjaQf3u5v4S+cjRtQ3zXAjMddg3uWazYR7EaEW0w9zeoKm/46ioxsAav9WDiCrqY9CwJOltFInBsaBy0Xsi/sD8PJ2A/pGWjbTAJOn/kFzAwLela8N4whWchhElf52YlZ2JTH8ykw== X-Microsoft-Antispam-Message-Info: hlI1g51Mwb5gWQHxH50Ta48lO0lvg6fpFSIV73Cz2jz8EwsPxIAGSZenySMwjqG9Oyae8n4HGSpj21xf4I0s3koDr+vh+kCvUhKm2XeWLRCxoMEW2rzJeIcNjE+QVe/VprCuYu7IhxmQ82wfK4yl/icsti5qPyH3m77qlTxFGzGwviQUj8iDxhdZl32UfB0xY/XtsCgIOi7H/2+2fYekRUkh/kZz9YlnzkUFFnLICEsJwaJbggibhutS/4d7GLLHYpDDAfHO+GIT6Jt3NsXiNvIigzh6jr1SNFpER5OaXmFr53CycVyVlbEoJo3AM+AEK/vq5w3E/La4EOT6teegOlhOhU57sw9goibsvPqchsI= X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1655; 6:ufqpsl44K7FKev7AvZK1gE6q4bZNo3uGY13qJtF+QPcTr3e08q7qY5lL/zgA3GkgzpHadvOnVmk2xH9jPMuPnpjPNyWsoxPjveMWiAcCkVBExuede+2sSQcngkXok7JcLPd8U0i41+ResQJAPuUZ39G7KvFggfarpg4shqYnjluzlCAuRy8dXkHGzAVQaERzWvrHMsNzxRWEZpAjwaBUQmFg+c0zeq/SeUZ7H7eetWYFtrby41bCyycfMx3S0xwxjEeErc+VE5Ox4UAAXyf/Pn6bnxfOzQYc3JlhkdYlPS7ndctPrMwaO8/P8O80N7PiLcCOQrZpq1E1PBimhHOgoFGrQ//HrULyPgP38Ygqig7vKWxiG7Zc2nebDurlcsdMomTsr/5GDnQwslgeT/NA+GzJmstiKxpsmsq0iDVQuPzqmBMjDP4x4ntDfRZ0YnXAAgBxHGDW/YKKqWJBHV/niQ==; 5:kZto3VoMaSp8vtqQrGiBRaXowpHJy+qoO4FXq0yiFT7wvHSInSy8Hy+GYZTQ0er7jTb+2Z4JqC0geWk/eM0eDkn/yJ2gvWThaR4Ij6o/u/guyLKKMCGaY6N6UjNXQ6NHpHN3DIDJY0NZgpug0XTk5XX0XC+iBQ1Qz3tnjWkLscM=; 24:V7+AiT5u7y+AfCC1Kx4dHgRRELttx86M+6L9/MT2U+A6yZkbRYdeSq4cdpptTFMF9MneYFegRzi+ZvRkxrxnvhXDMaWpNTJInxoX/PHc7dM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1655; 7:Ne7ciBPP40rqd0o8ve2ZOm9VakaVXHUZly8BBt21tFpTLR6yNpUzqRz5Qn+kOons83h9ssz2301Guemn0hnsLOI+w8RLBjjWXwx+Yxw7btfZJ8raNorXMiawFVdWDgPAD0qENIzRpGcmOud5nryF/Eef1UxkoefSiu4T5fERgNuS91EAdw5Y2UFePzdz14CABDe/+DwREYrf40wwDD2GaEnoJqAu3SBq0gxOaNGnXM5bDVz187WESPqrNkB+jQKb X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2018 23:41:13.2799 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 709c5272-457a-4b15-4e19-08d5e13e76b6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR04MB1655 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180703_164155_064425_B88006EE X-CRM114-Status: GOOD ( 10.42 ) 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.6.42 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_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index c70d1ef..a608263 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -13,6 +13,7 @@ #include "utils/uuid.h" #include "common/ieee802_11_defs.h" #include "common/wpa_ctrl.h" +#include "common/hw_features_common.h" #include "ap/sta_info.h" #include "ap/hostapd.h" #include "ap/ieee802_11.h" @@ -199,10 +200,35 @@ static int wpas_mesh_init_rsn(struct wpa_supplicant *wpa_s) static 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);