Message ID | 89143d059740da63c7a9491deca5a48028580087.1524027184.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="IYchzwIJ"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="ljSsAcLo"; 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 40QqhY2RxCz9rxp for <incoming@patchwork.ozlabs.org>; Wed, 18 Apr 2018 15:01:17 +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=UfUHjTb6L3NdBMsKh/vH7UpfSGFWiBfctWNjY7a4kss=; b=IYchzwIJtmujrB domHsHVYz6Bdg6LWUBKg159itXuofWlS5aCVCLLMPRPagUowaV1gk6+5Ff3LcKfHaOWZyaaPhiIkO N53ixmArnBDdj2RIGg8jfz/kPAMTkgx1KCXlRARwfMMt5X7ka6zd/HPyhedi970ubFctlWNRlesEv n1wPO5HVf/H5AbyrCog4X7gekrNj/Z0+cOslasc6tF/SGe4/Y6te7pFptEzv8dlZUHOT2CR9VJp3j wnzwZ0b9RDw2pZbsbsDSLfwpGSB56DOOG3e/AKLMSzSgZQeBuxchnBMAu1NxrLvYIhTxOjSC3YGER 9M2VksM8oLn12U43ea1w==; 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 1f8fDT-0006h5-3V; Wed, 18 Apr 2018 05:01:11 +0000 Received: from mail-am5eur03on061a.outbound.protection.outlook.com ([2a01:111:f400:fe08::61a] helo=EUR03-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8S-00037A-Cq for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:56:02 +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=e1KIvBvqlpcmufN9ZO1E+zCaoxCHAnUpc5kkuqAWBYY=; b=ljSsAcLofVw7LkqxgwwGNH+M9F2joF702dIUEpIugKXHj0ArSbrSuojI3J8I8CPbAgvK56XyDky8WGklMgIdENop9Rk1ESlsMIovF4+3+uqPniYVFBLz4uajM+82qpctU3tL+Nbd6/I0ys/XHINJChhyZ52w29vDDSI3eNIAWzw= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:43 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 14/15] mesh: do not allow scan result to swap pri/sec Date: Tue, 17 Apr 2018 21:55:11 -0700 Message-Id: <89143d059740da63c7a9491deca5a48028580087.1524027184.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1524027184.git.peter.oh@bowerswilkins.com> References: <cover.1524027184.git.peter.oh@bowerswilkins.com> MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:kawz6voLO3Mi7ixYypeHqbrmufI+XhltqJAfsuoQjIAFzjXHTSK8rFt7IK7CxpolsTlSegfrq7Bo4tDbMHhgOTn1ebB7iZlmMiL0OAloQ1mq9LR2XrunllmZQHbZVd5i+ECZc9OCandT9tR5u7rjx0wIBCy69a5e4CT6deQJvOQgrvxQDIADpqV3A0CBB2mHDJ9bagxSUpCuA+EFlqQR4vYApzV1zYGkAabUfpJLSc0oNPy+qyVXR9BxJ71HSXGW; 25:Q1mGI2PU/pTA4KXHkuMposEk06F9R1gfmoGaXOZIXTm413ZfLQsk6RpCyC4VbZbr/aQQxf8ZBwXT7n7DN6B8zflWAjFTivO49IfXtQ5QbSDYxMlCD2xZzSaBdY1Qhi9gLGnorx2wAxfICT6W4xhrwv5Uuf58hdgBLQPgj+5JhW9PD+TxNOdG7gEnZ6H0l/8MyC4x8aK52TQf7d75huCrNpGQJidjEGTJITAls5aYQ9rd9f4OD/I9NxG7MO2NXq5kZoxOZ9CzXIXIizFhVyiic5sLptafhBNxULInCGTowVqWo9loeYUKWmYXJtBG/rdP9+oJziEOMT7FEY54rj614A==; 31:qTmC7EHkxmtG7R5dj2uaT1yH89/H9sYiZKPkcaw2unKHqK+XLFl9JRJ94Hia6Q1SYt2d1A6GW5TTSSxmO4jJMxw7BCnoFFbyGfSkKteCajRkcpAqjvRYUXm137LnIUAoISyVIJBwHpqyJQBuZxuyQWC+tPZVwnPv/6kwjfwOwFxQZ9VBtwQ7UniL8vzckC4Znsvi47akL6Np3873WgjKnY71Uy8nhONCgtD0v15uEhs= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:7yd4+gy3a+amPJLydUdEI0DkiNZnP8LEZmwrtaAyPC7AZ7Mfc2Re+VchQ3ATOZYithCxPPptVEwLzxyViNjx5jSbCPy1RmrSaPpip+r0U2G+L3JY7FjyDvg30dmQIsyt1wJDBWy+/OnS1e2RlWXavs6Ckn15Yc0mpcO0hJ5EKoEmViQ3NMIPJeQoUr9MO/8Bf/69X14pzwBpHCxbNZ2hLdAYd3Q6WvkDM3FXuysRJvSVWuzxBzRw3f6bXUrJ8xZv+pFsLZ2A6e3ErF4+cjs3KBTUr1YgDZOPYMrhQCJ0UHIOy9YjvYc74OPC9JAMddFYV7PoFgBe1+SWuV9Ky+HOEA==; 4:Apo/viWtNrgcB7SSKL278N4loNhBZmKUkPC9WtCTXBslX/9yEJELBGgO9LkOe3lLxhKpXf4TX9jFnVvkXyRh5mw2vfl16TsYjC1RlI9ckbToTNaJgGMY+wWXpyRtYx7ekzE0mPSG3oEbk2LDe7275d/W71lJlYKy62OvZ3wA+lu3sk9olwTD/2P0Uuo0JhHS3Ro7DAZH3KCjHPsOI+vhe1C0zhewl/GNbYe/8s4GWjEQcurarIP3rDTF6/7v7ZSKCVil0UwYLJRmrGZeslmdZQ== X-Microsoft-Antispam-PRVS: <VI1PR04MB1663A6D4CDF72ECDC3C8D0D899B60@VI1PR04MB1663.eurprd04.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(59450400001)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:s8mYk9P30DnCf7OiUhXZrPLOJI7ty5Fy5xxRwjuRe?= XFVr1nR07UgY/h/KZnSOaDWHQIl38YpM2eMnxHVNIeZH9yL1smcc9IDGaLBpQoyWfmAWgUAGFnRgsQXMeFrCOkS8gxBRlrAwbMX+4jhkTeWo3RVFthKcgN1EZnRdAu/oNQkbg2ugVIXph43JQN+dlVUw/g+Qnw7XPUXR/Ngc+BkDkHCSdaNtS64cHIy/KnO9Ywgjz65qhBfuP5Q1tJGk9tfabG3UfpCJrD5RQCz0hWjfycGlyWw1C/vCsd9BJyskwjURQfSL3wlsJ65arbUXN8a89ZzPEgVC8Hg9Mvdfkm94Dy5mBqLlbo+2KCM3YS1iQgnBc5o5LqjkAaq7L7u8lu7awDzD2CyP41oNZOZ8d6RbLb6x4wT2Rv/qVizVcTVM9h0aFTZobxSdefehwDGoz8QDmuqf2/0ie5oFjUc1NpQMJrXLYa9Z+fhO9u08AhPg3/w7zEeDN0qoraVt/GYQOTBFLr1jn/lrN/ExHynpXAFp2YYXx5tI0jO4Sxw6p5oBD76CIx36WKqSGMo6PMPvPn7ZFJNieh7FWrvF25Xnw+JEXaldBTEQRC6XJGRPPR04I3x3EIzEzDiW7jfKdPf9oZAoLOkcLLEeuoiNacL68P6QyTVDxL7/wEfImRnYoTzWv0UmE7Sg9CFLwd6K001GcrJZJcHWrsQAVIwyvmZLHWzXVdGqG+MDKH4mHtqj5Hu4doQiMaU6LowsZk1EatJzcmkGszFNARVhF5LChrx8KEqyYxHDVkPms2Vf23rAbK8ufjMuwe/tFTwEDicZQLGsqT0VP5nC/1Wp+J4YZ85OTAbR60CRDZW+GndRWnDO9hCV1oihrUYfaeOu6oZ9f4Pqrld9dqJFyb2AmrBp/LqrCG7wgsOWUx1jW4EEnuxaPCmqrJUnvQA33+DjNOX8vIMkwO71+8MHZkdSKERP/0rrsU4DgisgTnOwZwmJdfRPT90HpQodysdZu5Vo8sz92smUGZ37Hg2zPqvQV/RutTgHgqJgkLI0HLqZmjYzd16Q6KizQ9I7MrwHm7wRuzyygiskfkd X-Microsoft-Antispam-Message-Info: KNgSX8ozro2w3ho8GcadqGG0ssjAP6IWMTmqMPWktUPd8GIFLvBS0lomPzpmGXzH9uhPzc/jm7MvgKlyZa/bh7Ao+ppRimUePy039pErcdmfvBjKjeBlChLCsMdwq5QV7nyxK9nwp9KJvsUqLxY26ylWz3uu4mu+M0lDRu9kkJXYrYvRf3ysThmpfyVwwwjN X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:v4VMfbBlHtgNbsbq00Jwd56SB0XOQB5gvamZZMc/dUsvgRiknBz64sh49hCylEQmNdIflmxu2OEAVIf7G+WJRI2Jo3rWR7AJVEjbdT90boLYRbzdbJaYVGLe8FW6BcqgvqIHNh9YxBaHZZJ9NuBUkZXHpOcolOH+Kfl5bTXW7RJGH6lQD8VqQryj9eYzplaYqWEE6D9tNfxZ7B16uH6Br1nsv8+ijjSB2HYod5cb4A3bElgz5Oy41h9tw3W8glFxtg8knI3MKC6Hkm2IeFMfNL/fwRImEmRJ/6JImoB8IHWw7u8q630iBi1vRqfNCq8ltuKwP7uHIETCPd7EZs+jIv2SWe4UvS2kNp1iaUI/nxwp124+J8p6kacV+aEFIpoR4Auuvedond82RPCgAxUnY7Z9Ys8CG1l2+x4Q5R2pPWqEB56cu5nhIDTs9vD7xSz6FoWFHOs8ypRXW/lpdZNi9g==; 5:PkTtw0Nkz5rztC6gZ20V+rKHMQ4YlldPtj9spjzeim9pBTBbwn2hmamyxYUUKTQP18IyIL9oJFzL5qUzObzew5VSlfEYO2Fh4OEHFA/ydgbxcuejqRQlRTAT9lh6o6ZfTIYrivxwxGDqmNMNpMvaoE1Ch3eMK0ZeMxTZWD4qsvY=; 24:+ycASCkGZs3V94Rl1agmZiYhJ9nmuZg8bjhKrdhX1Yjc5iC0x7V+Ga1zQO5vK/2tKILFvnt8hpESfC2Avp5aIBeytcEvrL36rnEggsRgjH0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:mAn6P3g8FZ9O6YXj3Y8bMUqtdpE6mQbLcIol25mgxigQqGDgItkxDHmFbPLJj84pyDFTCHUzz5Y8+Ir8p3P++51N2DFz4l5FFTVWFtiHbEuYGfAHglbv+J8C472Hc6OWaUOVfn0dgM6IJIEFmpj0SxncOeBMZ3ybWaZjkZCRUxHrm7FPvEfVUo0ApkKzOHMIAETIbTnwOWnuthkFsrI+GYdSVGMsL1YtRckPA/K9n++7KMwe1ArWm84Jl04AF/vQ X-MS-Office365-Filtering-Correlation-Id: 9c878ce4-d772-4735-4cf7-08d5a4e8a43b X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:43.0791 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9c878ce4-d772-4735-4cf7-08d5a4e8a43b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215600_484720_C879B783 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:fe08:0:0:0:61a 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 91af2a8..2fbb428 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2178,7 +2178,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);