Message ID | 3342d79d7ae85a6df33425d35281de2ef8bb2e04.1523526306.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="M/Wl+vRj"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="dtDfjIhQ"; 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 40MGSM3xCwz9s2R for <incoming@patchwork.ozlabs.org>; Thu, 12 Apr 2018 19:53:23 +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=hnwqArzk9RgQDySdhq+64ELBj+0k8qN9XHFyrm/YV8s=; b=M/Wl+vRj7qjDkt fa3fGJdfj67C408ugA8unpjRmTDx/MjcN7wgYIgcpZci5D0VwlKkgXXAO+toT6TeXNxEmLmVLf+jd gXzwup5VVLVkCluZJi/ctU+en+tzF8h8HW1zEBC04snTXPGV/lpJRsqjhq4P8F9ZIQeyZjsq7ETED Zjkj6vsPOpmt/VQhiSnm505zubZptU8A3gmr/JE8Dnf1UsXaZRCw2oOqfItXiuHFWMiMXFzP/on4X lKFlbhSDJJZKHqFxBGjPc6L58GSeIr52OZ9PtrtRomITeLWnYdRJbTf+gLd747YyU50XMOJ1B/djy I8LbfRXM16UHk9gU5ZUQ==; 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 1f6Yus-0008Ae-Lv; Thu, 12 Apr 2018 09:53:18 +0000 Received: from mail-ve1eur01on0609.outbound.protection.outlook.com ([2a01:111:f400:fe1f::609] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6Yru-0004UN-7L for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:50:15 +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; bh=QldpCNIlD0ysA6BB1EnmruNQfWq/DHYg9Wr0NGhpT9c=; b=dtDfjIhQ7J5AVEQw8ZWvXTj92lK+3Z0s/VaJpWch4E9UNyRdulyheaiLOCNEfOgmEK+s3LilKo/mjwrZHrUbRK4zkeHljcy5jF84sAquZlC35jT4zC7sD9hRgKQn2UPdd3btyYNQc+AQOEZbBFgDwGdhcrbiKdbAZqHZDlf+H3g= Received: from smtp.office365.com (2001:1900:2200:85:7904:f0a9:f202:eb99) by HE1PR04MB1660.eurprd04.prod.outlook.com (2a01:111:e400:59aa::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.653.12; Thu, 12 Apr 2018 09:49:52 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 14/15] mesh: do not allow scan result to swap pri/sec Date: Thu, 12 Apr 2018 02:49:11 -0700 Message-Id: <3342d79d7ae85a6df33425d35281de2ef8bb2e04.1523526306.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1523526306.git.peter.oh@bowerswilkins.com> References: <cover.1523526306.git.peter.oh@bowerswilkins.com> MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:7904:f0a9:f202:eb99] X-ClientProxiedBy: CO2PR18CA0065.namprd18.prod.outlook.com (2603:10b6:104:2::33) To HE1PR04MB1660.eurprd04.prod.outlook.com (2a01:111:e400:59aa::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:HE1PR04MB1660; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 3:TMmNiuAFUQehdx50zB71j23AKkwK42u0QpDL5zpqIddIW3KDQkz6QC0Zw7vDy6/o3ajCs2lS5sPmLPx+ZrxV20cYkUpKkMU4T3o6ZHCjtmCH9lZb6HphlflxZvPW0pWsW0nTxFhFGp1QOvd1ZUYZujwrNN+J6fBKVvkGJ2O+JvYjQ6uO/atQSO+ARRLLYeFtmzXAXNK1JMfPepjaX2Thq7lMK+LZQnMi4ztmeA4I7QneEKAWtW25C+FiFA17A+Y3; 25:SJQb10JgJE85C0QT+RYGnkUTCeI3DlWNlASsB41wBF8wm4sM0dQT/RwrIORFrPW7snLFB8dE5BSyIgLoUSlX8wkwOSlnmcGY8+Zip913aQ13AHQeZhfZ6c3apmmWrjdW6C4cGJvpN+QQ4KFMJK4o4rzd4AuiOZZYFVNDQqB12I+JNgcm0ddTSbxF7wPs+27FHWvL9YjHRVEwl1KLkomz9Tmuf7DbYPYwqvTvjxQwCZR8glwQmYDzUjYn7zmdaikcuEeS6SolBkTkN1rQyiu9g3KFMgMndYKXvZ2YJKjgH3mRBZDEqFYsGfHrvl9GUEsU0lfauAkYKw4VOy+e9zmhzw==; 31:zZgORzhZ3pbwsAZNJASmg6FuwP62GYEtCSg8mzaN4GyrNCZGtV71PaPHJLNzwb3D0TjPDF45VrPHS8+TAjrPdZyoiFMyB1jWEfr/AwNNkv74vZsbhAWfhqqefl68wH3Zcl1ByNFL/GXaCq8oU+8kcRaL1CrhCy3B0WFMyjz9zYEJkU5Nx6dx8ekwXW5/LSXLhAW9A5CB0CLfdifNVJsZuQbAxyy2KHJ8AJJx9DSvSJE= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:1z4c8WT/oixLNBSdwEMcgj5/u0uXFrS1UXEkU2OZwV59mWUn/9TdBqr4zRWalw2zHDrapYoOHV5DEwV1f9AYGDhr0+Td1p8WeyMShXxDrdwHaFdnvqCudDhF+RXOe1pcM0E10WDsYgsL/4ApdWu02P06Z7l5hufN9Su5ZKGINNym/BGNIYuWJneoBQU4u8SYeAFrCr8b2/qG2VZfDd7zBpAYHvo8BV8XigaNTe/AEGZM5JRaf91AHf6cSYzm28yAwkshs6qShpKa90z3i+XWzcmJEiJ0bhQ/Ft1Q8/BFAr6eT4tFTtZB5+YixXPNip1Lr3JHF2y77fsVtgm+drsjjQ==; 4:fOJqQxNS/BgBZHbaIMU32LNzik7/gPG56YWR4fAFYUUULw7EYlhnkHFLVlztBgLFhijlplF+q63dLAqjI1bc3xNEz6BXtNcUbDVjGMx0k3cdzXVqa9NgK9LMT+YWMCp/P7v+ewb6UMHf2mqzBQVwJC7qfh4Qie+jcF5OiL+qK6AegMyjMgED+G3pRptus00irXCWnU6BONrkoH4kdYEztQw8GY/wuHizRLsO+J6Cw8pyGnDX18msPAtiFuNjNCLYJv2ZHqCJuwU981WLJxh+cQ== X-Microsoft-Antispam-PRVS: <HE1PR04MB16609485160DB32C734A2DE599BC0@HE1PR04MB1660.eurprd04.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(3002001)(10201501046)(6041310)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HE1PR04MB1660; BCL:0; PCL:0; RULEID:; SRVR:HE1PR04MB1660; X-Forefront-PRVS: 06400060E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(396003)(39380400002)(376002)(366004)(346002)(39850400004)(199004)(189003)(8936002)(16526019)(50466002)(85782001)(446003)(186003)(81156014)(46003)(8676002)(69596002)(476003)(2616005)(486006)(81166006)(6666003)(48376002)(118296001)(47776003)(50226002)(575784001)(86362001)(6916009)(11346002)(68736007)(16586007)(6116002)(2361001)(2351001)(6486002)(316002)(106356001)(97736004)(105586002)(53416004)(33896004)(76176011)(51416003)(59450400001)(4326008)(386003)(305945005)(107886003)(25786009)(9686003)(7736002)(52396003)(16810700005)(53936002)(2906002)(6512007)(5660300001)(52116002)(478600001)(6506007)(36756003)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR04MB1660; 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; HE1PR04MB1660; 23:eDE8d9ltR/FGEOqTYOG+7RHJr8EfYCUrXuISkSS0k?= iRY/Ye1f/YKJVxnaoM0OjWNkUfIj0aJd+cJr71cryizkOsyfWV1VCmyAvXDHyL5SFPs3tpwgwc0/9ON6FZICRw6si5pelYNPzit0xPTVWJSjQmgO8cuUMU8B1Y4c96oCA1fRb5eGfTPgrkHnFKVYpWcm9qUEkg//uDfu623kV1N/Z8buTafiFlrz/HMrBzuSvMHj1VV/wmllOPctJCuTD/bLUrQx22/aRmy5zPGDBseAL4dm33kgOeEHnMltRGLS0B2YUvqGTnuoi8Qst9ZysMsh7NOO973a8vTUofv/kTFK25izzSnjVe3eq2qxmj3lgEA0UpbjUlkMRV7nyfv1EVIqZBExzJecSEDd1H6gFSvf0237FmKzmGlgV/LNeqMkoH7rT8WhUXXfZDtM0L88ZH24BOcf8LWNpZJM2hjFxVzYnlvNS+fMak1sBtGHu+kEmpSUzjkUvBDE8eEXTXRYTY+Hvipjn410Hdk+nY7LbF4jkkwNW+fzRxFKsCYdU2hB8sitPFLIFdvonhcCNp7IaMmzM2B2+U0DbZaB4gVF8CyH7vRJQRM2Gxt9UTmtJitu6SLVK8xCKw0prqc6+TMbtBhPpo1/pPMF9Vb6zVFTAPrtlNQNkh9CDn+i4MTtSTHhWigIVLUJUNIlE4JEPb/GLFMoAqgZprsR5TLG8Dp9glBMH3IpDPGj1/rnD/6htrvGe0lfivdrRUIprj52SntAsWvrutjSavqjpRQ6dMWAX2VK7qAtVNjmfAbsRgEkL2gRjpdj83yl1+X/BPjMtJdIU+A16jNvtsVSSCp5E1fun9oiCCFKjpsSh8lFN1AgiiQYs2a3h272pRQZLImGIdqliraSXDhAPYj7hBdXRuRrcO12RZlj+SEj+paftMtfh5Bat1eF/wmUWrJlsHh6s6gv3QvWRay8ykhKzSRVrkk4VqH0lVY/GI9oGxpdcarGU59dXcRMQ5/9JoDZInh4bNYQGNDz24jeBz0VpKZF6OvI2v4dgN4f2207tuPUZ/Z/ncaX+OBUIZnOPBB1u8bRVcNV1POzBzNYBmRW0YbGdjqTFJqEDZx83gYcxD6fwVivU+QSYG6KCJcp6dNBL2Cln7z7i6Y7XoX2s5K7XKI9DOemWBWWprTbqusdJw6STUti6A/enFRAZWJb6MVI3q+VM9oNPIPx9TW6go8B/GJP+9CgZlE/CT8gstNHU8ApmdJdhxRktIC//Sbq37bq3CK8E8GUHeGV7xsdFOBtYtlBcw0At4cbpqyhIdyfYAgzrkArFr/X4hWGowAQsgIn85HwKHAPlC4HMUAcabWPTZyWxH6RnxSkMluIDxSXjzIt+DqWZ1DPf8g2Vdw6thqmSUQ2GD2OoyTpqEBJ0AiRn2+h9lWIGldYfbnfZ7d+otcOgPR4zrd0+8= X-Microsoft-Antispam-Message-Info: 2HIUS6gVh1Ga345GOKG+/lNBhPZKMeHP9A7z+9A8E/qmvT566O5PFMASetE1IsuFpy6j7rsU/3LUBLJoAQJ8GB2xfA0EmOnZdlyqd219VU41PqyD3xuKNXJxbKlbAOR8+CDPJmmaGMQKkimQN5vlq3k/xxbIJfjmVDl9qaFPXcgmdXnwopyDoxLRLvhbyAPe X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:Id77EsI54FfTL5CibCky/ogtxmjkEcotyglWJuRf4zCsVK3w8Lzoff/J0Wb/zCuhiCt8YgFDOt/xMt+ARad2oTx453RNJJXgcfs0gc2deeFE4F14BpbvVlsFHK5vGX4iCGgFvXAT2cWdeAn5kT7QonTHuYcoqpzIvuMETkYpfzPB3n/UlICcihWcoVjfZquQ3NcXZEGqy+A5CAreoUUxYfWNNqQcUuMXUyIeG2xs/4mjAtWL6pEN4GZ0beWQMWADTJuTTBjnQmq0KfzV5ngRASR9oG/fcYW/AGHYjx4y+G4jkWN7aIKgdlqRDkcS93C0Yu+KHb9ltzj1JWw0HbBgJrrx/eF+3QaYh14vuuajfLsk4dZKcJGjc37xzO4l6c7RrQW4PV+ChYJFLLycdluQn/81/aJU2My/WUVlPiZ0pUFn/kkSs5QnBPKjV3gwfltVokGKo7sdORYS97LqwdbBFw==; 5:sX9DnLapsb813PQFjQg9qoWlceLppXLhdV4sMZ2Tb5HKROSu5zJ2TORWJfFE6925bX4SdwtS9cbezYNpauXuS4aKnP6xobzKhjjJaw3WbAMD2Obvc7Woj8c0MmhDMfjTlMiOZ9h44Cft7UdeQCtvnlW7dltuRSHvCnjkgajk8rU=; 24:uhu8F5UZ/W325dhXbjGhFmINaq+WKxTQrstgrkjhSDC9gMWXx4r7Ydy8yqCNtE1NOug5BWZq+JFnPn3ONMuznSgFJPySAFEq+rjecDbbZMQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:x/ojl9S8nZfakMJTnUHa41CKFOyVchPYbrkgKw0TUpjKhoDULDscKBdst75FFK74owkFxy48gtQyFq8LnHqY73Ldt+oQhnLc2KtlUtsOx6MdGaRTZGOcx/ysp/I+0D7MSeQQG0pmm8H72MA9/krTa3xusAP+swStrnBWcQrtafOZ1KBa8Vrj6ngAXb9XUunU578lqHaMrZpOMLX9RkMLNRZJAz443AxvdIMhQGml4W/g+1KHy/2wB1XhQHJPMQAz X-MS-Office365-Filtering-Correlation-Id: 9f08aac5-6eff-44c2-5e27-08d5a05abe30 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:52.5977 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9f08aac5-6eff-44c2-5e27-08d5a05abe30 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB1660 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180412_025014_372405_5CC8A27E 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 [2a01:111:f400:fe1f:0:0:0:609 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -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 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 9e9d03769..292551d0d 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2158,7 +2158,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);