Message ID | 0eec9b50d7202e26b6975696f0d220aefc98484c.1527814610.git.peter.oh@bowerswilkins.com |
---|---|
State | Rejected |
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="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 <incoming@patchwork.ozlabs.org>; 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: <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: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: <HE1PR04MB16575A2EF8C69ABB0D884CA899620@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)(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: <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 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);