Message ID | 77ff996094c416940d8e2e84ceddacce6f5f4b16.1527628707.git.peter.oh@bowerswilkins.com |
---|---|
State | Superseded |
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="M7C5/XRL"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="OTbKDZlD"; 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 40wRZY65Zcz9ry1 for <incoming@patchwork.ozlabs.org>; Wed, 30 May 2018 07:24:53 +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=vqvJlcaHTPHk7qj2iQiG1UBlSb5mNIOaH/YbymWV7uc=; b=M7C5/XRLls/VCi MxeEuwRE+/eFywdxlOJijr0o6z9jPU0hlk1k5KV2xXKxJeNK+TA6gwR9Qiu6C4Kug/wf0KZxx4zjx j7IZydbN3eAJNW8mjPZUUCpCBRHAMqvDJ/rbwVzQfNJBcyqpD9X8chw3XBeMq85EYpZhk9HtpteUF OdQg7dOWizJROKCewMfvRLVKl/qXQ/v42OcDZColpVXg8uz22Fc5nCLSJjCFIge8JakcDHzkp/N6S hpHySDit7HQU3aPNFc7OJxricx2meHQndfK7zm81T4qDGYuzhbt0cQJ+zPaqhioHrxt5y//jCpCyy ba6uUehCZLLLTznWy8Hg==; 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 1fNm6n-00058D-Q7; Tue, 29 May 2018 21:24:45 +0000 Received: from mail-eopbgr10058.outbound.protection.outlook.com ([40.107.1.58] helo=EUR02-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNm2S-0001Kx-Eg for hostap@lists.infradead.org; Tue, 29 May 2018 21:20: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=a5eoBuEq5RHivAmGlam+3lItqkve8STm0J+nPjuUFLk=; b=OTbKDZlDsMO9EYR/961Ww8rEqRHGgq4AVdBuMEZwZl20ZvqRxAUNrjbbOGF+EPIivCRxFHq5ObZI6Ng3YMPTCY6Ik0nfioU3Hey1w90FQ75OhBQhZrVKzunIzR4j5GsaWbcMrgEuXxKYmAkKjB3bAr2LGy6mtbhuj4xcdijS4n8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:bc83:1bef:7e2f:6957) by AM4PR04MB1652.eurprd04.prod.outlook.com (2a01:111:e400:59e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.797.11; Tue, 29 May 2018 21:20:00 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v4 14/17] mesh: do not allow scan result to swap pri/sec Date: Tue, 29 May 2018 14:19:14 -0700 Message-Id: <77ff996094c416940d8e2e84ceddacce6f5f4b16.1527628707.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1527628707.git.peter.oh@bowerswilkins.com> References: <cover.1527628707.git.peter.oh@bowerswilkins.com> MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:bc83:1bef:7e2f:6957] X-ClientProxiedBy: CO2PR05CA0101.namprd05.prod.outlook.com (2603:10b6:104:1::27) To AM4PR04MB1652.eurprd04.prod.outlook.com (2a01:111:e400:59e6::14) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM4PR04MB1652; X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 3:+HbPAQZjEPilyMf2JoLOn39wywGgAtQlzAKwW4Vy8zPiRo+SkmXcoWCBowzh6Ruvy0axOqohqGr/HSV6uyNXEyRBH/wkfZN1KhvWjdviUfXKiDG4y+dW6NzQgTcxcDRUPVPwAr7kY7wbbanYg9kTrUQ7rFbk65rwYLni7Ji9WV98DwVBqwtgBCwgVyPLg7B6UlKoNvy44ausn/UpGpLR2Zh9GNWi/Ea1tiwGMca5L0Z5y91Zg8moHfDN6pct3Non; 25:j5DsHu0ajtVvno45MiT41TBgSumW9gmCKn9QgO4vM2GNTXqNOmTJmqb0zFSTeG5R0rYRdNNfF7STjD8R2FA4sIJ7bL4n7rZ3HjhQxwaCZAqy06ynYZb8clwdP+1uTlOhsnJ0OeWs0rWVzLUAU/sjmhfHduu3MqnZLQk9RNP2rCD4vnG0HRs3fjUwbi36sDZL4GyzXyrulA69OYU5L1pXBEHkQDLb4LmKa+3yu0QfgP7JDdt6y3iYfCPym2elXHsIqCT8KZBoEGK0rm24+s9LiQlHPCLfoNPey43ZVc7uqet8X2vKEhg0u9kJ7AZ7Zzk2OwRzTgUU416SFzMDK8jKzQ==; 31:zrSYMbi0pmZhAK1YF0kyJFNebgBd7ol7PTa7icFyoq7gV/qHZXl40fTcePeZNFQb+wrSnUzSk/bOctTYb1qdwbO/Di4ZQicpRFr6V+71mPrNjtpHCdDyjN2Lxc28wBaVkGTM1g9CYhqV2BfrktL6RdSmEJY4eDR+for/MEdnyjARhUPw9VUeNIzCuZDtj0VwefRSw027IAw3Xq0oKxcakAbkKi/Jeevq1VdpEVc6r7k= X-MS-TrafficTypeDiagnostic: AM4PR04MB1652: X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 20:4pjAgeV4XlPf0W7oosZRgaCQiQ7ALWX36QZxYvMiF0KdIchuLajiscYZETmlofeQvqqqYRa7BUbo9leb07qxClG2VVNzF7hgAjT4kvQIOFan83KHnbm/H2KcCmF3xqtd+akMgeWb857rWnG76Dkd1ZO8LW/om7aAkq+eRZy4AKJhDjwj2kAVhNNskZOsTe3c+6uR0+XU7IRT3mOO0rtLuSqbnUudoOOQS3d6bPmBoaFTmkqNc0GBbufp9ZEAyOE34kexqw7z3RxkIV+KBFbb7OXdm0ruxiOpb/rR/1Rj3ZLknBVaZoSppO7LqafgrK2cgdvKJ8i1DWGYB2Lpylk8Sn1+3nPMddv6twjoUtQJXNzfAb4J3yb0H2//joMYt2eeLDaZ/1wm4Udu+eEeyufv1adeC3xqWVpJOQRR8YnKXus=; 4:9HsJd052GGBPgwvb+po0MpNbKJu+ZG/RuVbJLpXRGXQHJk/4cglF3HWXFv69O1pTqK9cMy0j53galbnQ8EpwjhxW8DkBsFrxdpJ2siiRJIq5o/2A22DP3ht45sfq5b/88GnIX4X7pKU78AZLI8gqgP8jB+yLdVUjFKKogzn0OltqpXoP3zyMHBVnM5pNFyGL6CEfHHKSsiMcpP0quKiKyup5R/9e+hoZg976GKKUTvP1LTE63EYACeDWygRUQd2RRhtCDHpgFMfuIJgQM2gkhw== X-Microsoft-Antispam-PRVS: <AM4PR04MB165217913736A743FDACC8C2996D0@AM4PR04MB1652.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)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:AM4PR04MB1652; BCL:0; PCL:0; RULEID:; SRVR:AM4PR04MB1652; X-Forefront-PRVS: 0687389FB0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(346002)(366004)(396003)(39850400004)(39380400002)(199004)(189003)(11346002)(446003)(68736007)(51416003)(46003)(486006)(4326008)(2616005)(36756003)(69596002)(33896004)(2906002)(107886003)(6506007)(59450400001)(386003)(76176011)(52116002)(52396003)(85782001)(53936002)(6116002)(25786009)(2351001)(118296001)(2361001)(47776003)(9686003)(476003)(6512007)(8936002)(478600001)(81166006)(86362001)(8676002)(50226002)(50466002)(16810700005)(81156014)(316002)(97736004)(6666003)(106356001)(6916009)(186003)(16526019)(53416004)(6486002)(305945005)(7736002)(48376002)(16586007)(105586002)(5660300001)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR04MB1652; H:smtp.office365.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR04MB1652; 23:rqwuA4bREc+BRlo17YGwzv/WIFrg/YO6xwCXVoQZn?= j5nvwJSP5JkrmpIp70pHXxZFK55iC1QnI2hpOhxIP96C4FvkwYlQzu19rOnh/QMjGAV3SyL5HJul2QSPDBj8q/zN107KXTmBHgUqpguVGrXGaEMrI6pPum4S70zT+I4rkX++T/ks+pactVbpkMtfeZliO4S9tSaBLx5nMyJUqI039ly5ycDapaQWKQsX+GNQXNBdYbXQJ/vO+f4xuQGtUgmNvZQIl72vVSuBmdDGYyZZHERMduvGKB8vyrp4qNuybf1o61Ou0bMLTA3QtmEHW8o8Y6VKQHt5iwLCZ02A0oQiugVtrRSe32HoLsp2/fzKh2QVMPfqtrSW3kAvzMIa0WuKmoqXcypqoUZjXBc2i7J1exx07NWuvzuGCgEVe6K5JdM/y9t9aV+xFLDhzI05VPrj5M8fJHkuoa3PUE42uhUOyLHTB82bwsPTDjK0dpqRMjsaDRJ2rgz6BJ7eMVOMng+RJT9qQM7KsNPPVCSn0L18/Nb0zD0y8JOVhDJfcLXQ2AqJM6WKSVIjLJFzALZ2uvcqM1Is3qO3qCnLXbW9X1lYvk5dP2YrhJ6bZUTvrd7zppOlQHyg76P6udNMpg2VngfIKsCpf2bKrtdN+mgoLgGsDNNLS8Mx1dAn4czw4KE3P6Bs1EhaoCc+8EtxYOcsPSoF7ONE/jrdXJjTevPIGaR0e1olzyUvLgsZQRC8mujLFjGppysPU5BCynyQnb3XpE6EQg5z13A6Ftlqj5cj+0MmhfGIhdAJXwvrJJMChw8pCl+9HBKsCV6MARpQX9rpZMqNGOXSdcm+1XIy50YbGOwdr3zMXM1eW3+wULNLyVxIlSBYYsNcgAkmIhWzidglRQ/e3UY0we3NdQmDCUVrD1aWgmPNUs9dt0T8o0Iy1VJGdeNHjA7pg+aSXy/buIPHm3JdxTH1iuSR2HnXCzIhhJY67pWKQu6LiI1Y9L/szokD5diUIYyLxqjwJ8sjciZ+STbBSY/g+KmtdKi/sNNYVvrvHBYAW2tHzY9JJoeiRoeRlApbw5BovfBsEAWkEY4De5vh5kTRd1jbQXSsd1AqiG15WLUv4fVFsBVBY/r/s1F+iFU8a1t+PDYCARcLBWJwaro/d8PLNQpWWJMAhPctOGVo/iszZEBiOXyY0FlYjx9fpDRDyss3ge03Opcl6l1GHUcluwSrba55zkPcn8ako8Xpqf23KGvRaI0K0XKb6HK5kPcbzyMIsc8QpcsHuav3VoZnI4shBtjq57Dlol5tYedsZTV0LkrJvQHrThIteuKA1YJYrE0hsztjQ5amhZwK2y34wHOlQLp14EJ4SShj1RMZ/q2WPzSjV/trvSciQnwqop4sRFpDHafmPhXTQOMTNw6 X-Microsoft-Antispam-Message-Info: DvJ5Csgflq/oI5PFiBUwCf0KBkyQvqQDm7Lfg6Qzp9f5NycN/aitVg3wVrjTKeiZzAf5O6suj3kl2Knv5euwK3L1jYII54dm+nj922xX5WC6/AKTR21sY44KvXZCsFw3BL8jKuGsvDhbw/u79bWD+r9jLhCwXo8ffJ4pwPqCIQaBxotjtZHcsLhgcqRefi1O X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 6:RrXK4ZXUTPR0FfJzYbA9QJbHCYa+mLBhQilZvarIaM5xwIfDEA5yMFk+gAF3RS4JXojMV6W/wJ/Oj/TNYKX5hcLn9qGaC/Gys1VUrIs1cq5VS1y80r+Z9TdKuAFHEEK46tYd8Ec9E4q3noymj3ND+UiO8SV1tt7LcD+F83v4JEZs0sV8rN6a2FSGRy89HyhQWvfx9BDtDpiU1VX24+QSEYHVwEAhRhmfo6JilaZy5B9D7E8pugIecbQhULpoNbBF2yeSVj3JnI++vNq0d6X7OoBoolGqyIwLRTUcrVhHg92qguYwocqfY17OzWA+aTQfJIx964bJvQ4Tdve0uOMTurpZsaWchIR79mQ4x6ZUJtdlqOfHd3JoQNx2Q25FTsqjkcHciUblVpsNXE/mNpFLE00HL19ben2aqJSiN8zSKHUEt2+Qloc9sj8wOrwAHmiKWEP7XQP0gM4PglXH1B0hpA==; 5:5U70mzqZqb02p4tgdD3abnww5Vj1aA5pgXYyssT3yoVAULg+Yhit33oKXGhbiSSo/rzeJozctl8WmRPFTnRuRklm5doxioDDPvD9uyZcrRN8QChUCMcMNYPeWk+1yFfbt8gftmeGXszglQYoBOmRfuGkZahfWm73FM+gL67gCpY=; 24:W3wRtPyGRg1oMrzghe1XWoTqtrQNSnja3La1duPWmdyyNbiXkJC1JVhMFN03HI/Rl0s/pUpCftYHpcNpCZvZd4YZ6csbGEF25F4NF+/Yj/E= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 7:O/EzKU5cjr/exfzu0Kp5KGtcoX6etPNDc3qwKUH20w9LErQPdcgIFpGyceM/x0/NrBGNuYJrNVhNzsiTciMrQ0p6zl+4gh56nNylTicsD+8FIIn5yyDYI7iu3UtZ5B8rMZdcwWyz13zzKTUwrAr26qn0KaSWUgSAi1PctMbRxyNnviBdiqOkqz/hMPSuatWIy/OeXBKNdStX/g43M06AzQdcP8AP26/0jaFh3OWbAq5qDlPEOR0Yn3ZDKJfAPJx1 X-MS-Office365-Filtering-Correlation-Id: 573a34f2-5af2-41d4-732d-08d5c5a9f020 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2018 21:20:00.4510 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 573a34f2-5af2-41d4-732d-08d5c5a9f020 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR04MB1652 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180529_142016_518856_F202561B X-CRM114-Status: GOOD ( 11.82 ) 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.1.58 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <hostap.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/hostap>, <mailto:hostap-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/hostap/> List-Post: <mailto:hostap@lists.infradead.org> List-Help: <mailto:hostap-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/hostap>, <mailto:hostap-request@lists.infradead.org?subject=subscribe> Cc: Peter Oh <peter.oh@bowerswilkins.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
mesh: enable DFS channels in mesh mode
|
expand
|
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index df71b4f..b26e933 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2185,7 +2185,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);