From patchwork Thu Apr 12 09:35:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897576 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="h1pLj7+F"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="rRUqVufb"; 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 40MG813THfz9s1R for ; Thu, 12 Apr 2018 19:39:13 +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=h1pLj7+FfBfKDr rCFMwR8aKJqvH0VfsAOPdYNCzdE0lR+t2gef2KNtBnYzGIea83EHKIGrAlY0tCdQAV4NhT5gcESLz Y1xWNNHZQqc1o4diQwfx7PRlEXJff7NXpm4iapPiOHvT6Ug77brGDJ4onajqKE7AbHHV1/rVt7SaS H5ifge8Cr7GNDB68N0hgLf/Qj/ZvSM4RyHGkkPKmZ+beAldktDgG/Pguy5P+K7Cfmt/JFubvh9DVc CUJ6mzyl68/iqDSu8eE0d8IIKPEgWlftGx3zb+jBzkTz6Ymwuujvzc6PyLuSo78orCNqfEgsE1wC2 K5In90DRwo2uWkh15BIQ==; 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 1f6YhB-00080P-SQ; Thu, 12 Apr 2018 09:39:09 +0000 Received: from mail-am5eur02on060e.outbound.protection.outlook.com ([2a01:111:f400:fe07::60e] helo=EUR02-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6YeP-0005nl-PE for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:36:23 +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=rRUqVufbRtf4af0wSJcVcjpbWy/sLA19XMiDHeBklCP+OwWgWlDMQZQetUF8vjvwW+qvbafOMMEYw3IU1Z2ahjHmlBSXrxL9ktMTE0Sut+qEBKFuPxKLZMOzlaZ6z/2W5jc1emsCc1yiX8y93Z/pHmalZBKEyJbutD+6hV+ibKg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:7904:f0a9:f202:eb99) by HE1PR04MB1658.eurprd04.prod.outlook.com (2a01:111:e400:59aa::12) 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:36:04 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH 14/15] mesh: do not allow scan result to swap pri/sec Date: Thu, 12 Apr 2018 02:35:27 -0700 Message-Id: <1523525728-32743-15-git-send-email-peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523525728-32743-1-git-send-email-peter.oh@bowerswilkins.com> References: <1523525728-32743-1-git-send-email-peter.oh@bowerswilkins.com> MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:7904:f0a9:f202:eb99] X-ClientProxiedBy: BYAPR02CA0015.namprd02.prod.outlook.com (2603:10b6:a02:ee::28) To HE1PR04MB1658.eurprd04.prod.outlook.com (2a01:111:e400:59aa::12) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR04MB1658; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1658; 3:ZPorKQ7+HlcEFcALxDvm7+e82/SNmY93OPfz5uCOL7V0CnUIfZdeDKqcIHCz6n4yaKRnwavlEvoC2GoQ1zLqdeuHH8cqfbjc1353ZrqWdKsmtbUojQDWGDPGvBpKPEXQ7A4nLqGH86l49ysytXYN9Iyd/LcmKuKqm5edCFCs8cT6sbFtTvIInn6YOpvCYb97D81y5eIdzzoTeMin7w4M3uQlt5HMo7A3nAtANKZJoVc7eb7d9oKYZMsFk0A4XLcx; 25:MUBrLDLsHpYAeg3R7LnoPpJpXoZ19RXfRentO18Beg2CV1V7CIHTPE4Rme2HixrR/TQjsx8JS+P6W+lBTZYHwbtkUbiVn9+W6dqmtaOIbkI+qGRsWQ35S2PcDWKhHoBMWDl6rXPcZHU+76raB3dyOHL1zJlr4DHR+aJP6TShn9+UZUULdsfGlCDbwcqTzJfIDKvk5IYX6p9RcC96xRwTGr5icJJQf56ftmzkIQ3pAaNZ6d7wwS3o1clEdDRx8tmHA+j1wkgAsy0HYw+14T6ul7pB2mu4Nvfuy2W5y1wm0BP3J84uPCRBY4UF2SGZSY7zeUcuCsN9NmrpC4flP35fWg==; 31:aWeNe1O+mS3N4N5IhUaqtt/ZE/RkG8CWEekxdty88hgrDF3600br5cDne7HkVr1yitn0k4LGmZp59BALXkdqMsJ893ZUrhs83H4XcTkBwAXAw21LuQ9j0WIBtCX3uFXRmv1KwgViAJj+bt2te8g1bfD2Fv77VSxwt5m9jD5jWvT8ZUK5wpFxnoJtPkejaccW+0oFMhpliQy7Awyl0nuyiGN/GTqpzAUNgYoD8xb2v+s= X-MS-TrafficTypeDiagnostic: HE1PR04MB1658: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1658; 20:17nGwFiD9j08NApRN3e0+PY7DRFDRuNbg51uOkU31j1kPX2hUczA2Jn49jj786hL+AjVYBFf0Sy/VkMfNbTu/tlwQwMPNpIfWx/sr3VfMwwXxAJrV9GDS4abiLnlnr8VdlVUwXw/Eq1KF7MWUcjHELzpnuGU27oofpUZt75DLK74ro2FNRcpmcKjM1Qfdn/YblV64F7dQQIb7/AoplnbnekgNkxyOsbHFDOTv5ny90YkPVlz1+ubPnsZjaiEjwu7oix+d+LOPm7fetn+EMkHMudVq75SZ3s6QXSiKSgLY3YrcRIXKGfuJX4rJNMC9GcMTplQYgPepz36uTOfEXFY0g==; 4:i6EOdgNdT2kJaIpPZ1KAZi7Pdec3PxYnI/oNCQ54g3JF5llP5dQMbMZF3IXymcJX+x9W2NYNtY33eMcmMJs24J9M0BN8k5fwr3b0Wv1xS6x+8Voptx7TAX5onzKeaREehdzS84OAkrIs0zW3ttfBydzky5BoQbHU3JBPSYyXKBS6xupLvApWF/TciN0E35UTdSka8KIVF9Ma8R3/Go3to7pC0o/bSPQnHlD8xn76FLTz9wFi6Yj5prVcO/z9OMqHmupV4tR7p50NGcW7ugc/Ug== X-Microsoft-Antispam-PRVS: 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)(10201501046)(3002001)(6041310)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HE1PR04MB1658; BCL:0; PCL:0; RULEID:; SRVR:HE1PR04MB1658; X-Forefront-PRVS: 06400060E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(39850400004)(346002)(39380400002)(199004)(189003)(16810700005)(6666003)(186003)(47776003)(16526019)(107886003)(97736004)(69596002)(476003)(53936002)(9686003)(4326008)(6486002)(6512007)(25786009)(5660300001)(486006)(2906002)(81156014)(85782001)(316002)(86362001)(6916009)(81166006)(575784001)(8676002)(106356001)(2361001)(7736002)(105586002)(53416004)(478600001)(305945005)(2351001)(68736007)(52396003)(36756003)(6506007)(386003)(8936002)(16586007)(2616005)(33896004)(76176011)(59450400001)(52116002)(11346002)(46003)(50466002)(51416003)(6116002)(446003)(48376002)(50226002)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR04MB1658; 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; HE1PR04MB1658; 23:+M3Au7svERZzJUMQ0ZNHS6HRqoP3A8hN/9XN4NRoi?= xQIAbh07wCx2Yv7rhR6Cr8OI6Hq155uyo7wwnDakrkfBYDjHYEp7QhOXNCa5cep+lIYDvVw6hZpxxqG2kHmcIpHVuqjyUkPp6neOMR0yVNEj6gz0UJgb0Qea6gI9BDj0pJENKNqt2rBseCZrRkV6OVn2CQh+B21V8ktNOI7Ye230IguMrEYtytOfYL0PBqpffa2s4EbIaPtUZTpHJ8YA5/WOHS3Le16PG3jvaXYNcAIGvNpYNtRjXFXX4mwpeuIPuw6c9uNY8a73hM6Hj02xCWd9uZwmKW3mn9rmZz0Lg+3nOMV/aMj7BjWH3lHRwPMwEGYTSHxHDQEp9IZSSaBizGHVanFSSECks0CPLZGP0wjUeGGLJLTbizbDjFqga5rFq0+Id53T20R968wdFk7fTyuvBN730U70MnKVxsc2mbI2CpHHrASL7V3L7vYxBsh8LD0xNTpqNjjdowt3i1c9L5zykm4HTOpKiebkmY5WDlQqgf2xHFOxZ0N/cJo1Gjjo9qrb9af/2CtlAdli6yNDAbHMwLAct1XedpgB2adRrfxIUj6YVjwhOxbNJO+HakmkM/PPYcjRX5tcMlu7jraVk+uQwx7t6uC3ng9ONkqcO3fZ/UFeHHdWCtV/58shOuYnaSbxTEPx8YJubTcHGobcTOs4t1dzpOHtWVmP/+3spW4BLkwBHEhqTuTTmFaZ0OfpkU8vCyo8gKyoGjHJ9nv9V4sHuMQQUGELUC3xJS1NiFmDKQm0ZOvJGjpji75JeenbO0VEIKVpJEN1ZLvCJY3qVdeaSh2UQvDewT9TVKtNuy1qHANtby9UlfrKr7Sz0cask2T+3B9B2Or1jVTUhGJ+0AZeKRjuUuV2scYmycGo968ccNZWku0c3MRsY+RetCzlYic/nglnXYfdU7dOb4MGx23Q6QVnoXiAwkJNGdMay48sOQ+Z/yz3HdB8w6JSpCkqdhxswSbITFPb/u4qcHJ5GNOgdE1Q7fyUyjT3j+FNdAaIndrnhXG5PDZUlvY5KgY8Z5EN94+UWWxdH7y3fNdex4oVYwi7SxYbHckNqRie49ZF0RCuadEmwBLhXl/V0g8HC8tlXP5UpBI0FrCA5BQqQvDQrCpiGB7yxyBW68mVuqOMAcENl3sEs4uRmGu0kzk9IUa3hjX7qbXttkAAwB72pNIJTPi9zaeWr/n6McLrq+cujOqXNzpbfztGylFYK5c3YDWWGM6w2gy84VrrJqqhNvBcrgPMnNWWdWNfnDfAfWTXjHF04ZZU5cr1fbbgNW5C2Zcdx93vLf8TehGH3xec+ApbU1hVA7CJNuX2B/icbvimCEMOwyFh0wILsxRkfvTwOI5p94a6MOgoUOgvV9Bzb9v X-Microsoft-Antispam-Message-Info: xCyNoTE4oWIIH5cXFzlAcJ7dSnjXdCXJaFc1vSL+FCdHFVjpgpyYUk5ZBlUquXDUiw5p5hd5D/0iL0Ih1PGiTNKqqggWeXeEReuayheUWUYsLEmqkjOMb5YKoL2f/dDUELdiKuf7H6ejLxvmM079cy4SMIehtZmIy6OVOMShRiP7CCzrue2kwdatHENTinnV X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1658; 6:Wb7g5orXVgTxzk3mfQi1abiHi7BIzCSBC+k9tsu2zQTHwLfMqOgX4bCRyQCitZlQMA9NMNZDIoWDkBDoHtlVozQgE7TkSsDJHwjfBYRQNJUm7a3u0Tw+D9RIvdWKY34cYP5SiokO3LVMYq9gDHRhWzgxEtKKFKaHUKpQUiFXQaDgihTmnov3NwJVhVoUwr2boXNV6A6wkJnS9XScPmr0klSepZ3uuFGm74RjjwQpfwzP4XTThuW2Fn2tjJJdNEkYATMoSZfrFTEoGuj7jnqrSZCRTwN8WMEivgsmJ7X3gD3odmtKfeUA9ItO06Pm2Ey3KRPfJlZ0ZE1VTn4A6x40LSsQHx9OGV662rBUiNSmQxWzZwoHhBGAOOWovqZAeiIpX3tz4ATv6HOQtLPiwB5ZkrP3nYMGm8PRZec07O/GTSyEt9VzllUhOBL5SFzkQ9tcMFxEdno8OmI7jZ0ysx98XA==; 5:bLJV1FJnlUkzTKGmnZZcgpq4ayvVfSibwKuOfSQi4fvxCv47mwJDu6uyOVuFQF7cMiUNB3bbAa5eysyyjH9MsghebobYn3YKSHAFtOdimKEAUkU5VSUsl6Yl4MOn/V5Kq3pnBgYOyh6OlVcUMN2gARGivFS0YlyCLqCYvhPqVaY=; 24:e2ObYyFS53UpQRxWAUoZvkmSFq6tDm0yLNPzcMHlEh34A3NPJr0KPdKB3vbeinI0KKvuyH1IWSEeIfu1NdqtN83t1jPqjnY1KW5/H3VasS8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1658; 7:BVzYzI6MUPeoenmZ6kP5s+rEUugjxsES/jmOkqAh8pjvRRqmnFSt8y39XB6rUkhosaOaOFYIOqQe2l+id5MtBi8IUNlNEWKDP1lI8QOTaPmO1yu1kl+5HwOQVTXaElhDwR/FC2QM8186FFAuuLqRckkRJrcMhdSfoWdliF3Sz6GaL36UuFEZywkQ0SVL2HI8lYvZG1M4PE7UxfsKHbzLimQPkcIzzGlBH3SFQxYotqR86wPcXfswLi9oXkcCTe+U X-MS-Office365-Filtering-Correlation-Id: fd462cfa-cc51-4a68-a7d6-08d5a058d013 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:36:04.4120 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fd462cfa-cc51-4a68-a7d6-08d5a058d013 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB1658 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180412_023617_856920_0ABA64CB X-CRM114-Status: GOOD ( 10.11 ) 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:fe07:0:0:0:60e 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: 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 Swapping between primary and secondary channel will break mesh from joining, hence don't allow it. Signed-off-by: Peter Oh --- wpa_supplicant/wpa_supplicant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);