From patchwork Thu Apr 12 09:48:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897588 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="CTC/m2mg"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="CFLW0Sch"; 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 40MGQ54ygqz9s1R for ; Thu, 12 Apr 2018 19:51:25 +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=M1Y26Dj6KamMj1qrmcgTf3MnqGwZrgBvvwnbofPHhws=; b=CTC/m2mg6oC0QQ SvFPRweS/rVqCdIMtrjR2tRHvflHc9QPCoGSmp/sGhi51jniUBw1PIw1KBb74XRmR048VPfuLwUol UyYTLV2qJDVjnRteM4ITKmf0RbRSBeA/L7xBRDhMOmmd8btDCoHw7YiPpdnOFO7tVPcy3JqcfwaYI bO0YxmXmjCnMEVQDywd6KCqaMq6a6gJ6KwkIk/YVhOJqU12rvucnLT6kPWpDpmJkfKJXDmNvsuEZg jMvEWyjdJj+RuuyjvwI/Pgk1RJQUz9lLqt7XAT01XlyICK2Rraw1Q5MG+ZeP9iJAlvyVareE9gQ9c /kNkTLTAdhUl+lJ0gJfA==; 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 1f6Yt0-0006cC-8y; Thu, 12 Apr 2018 09:51:22 +0000 Received: from mail-ve1eur01on0047.outbound.protection.outlook.com ([104.47.1.47] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6Yrc-0004Qg-Oy for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:49:59 +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=hY7Ju5au979htJ6lwZEI678AflaKBXW2YGc9lUF84a4=; b=CFLW0SchQ101uU8yea5zukI3hGvYJkUHWCDoIHe/vSAtxcE4CcnVqAoTKSxJyXGzFGz2in8nPiNNmWBv8eP7ml0URQ5vkh23G7gqK1PB4BNF+ATxgktGaUaA0Xhisu7x7rZSYSGYTKvzQ6UbWJVTaUP8NY6bRPtXUWwNYJxypjY= 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:34 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 01/15] mesh: factor out mesh join function Date: Thu, 12 Apr 2018 02:48:58 -0700 Message-Id: <05efa55375035de3dd87a9cd8478b7d4ab09983c.1523526306.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:YPAHq15zNiRPJIAhaa1gTu0holUeqJ1N86GVND0jzcW2K2R8UgZ77RspwefvpchK7s4MZPvw8kTotkJ2QIfKXrH1nfHz2r95fnNBc3eZXU1rUqX43VZ+SSBT6FZr1iy+D0JpUa4/Te5QFJZqcCrLjlSOT1ImzqxqJlp/m4+wevvhsrnce/943JN2iD7/20yWmoYIUnnO1rGnJJEmJp5J96n6MTRjBRxKBDxv00vZrVvwqDDOC8Gs8rFNcHTVpfob; 25:GgVmNrwxYJb6a5ptB1K6WKKL8onTk/NvRuidwXnD5GRgTjTrGgYDTDFuU8eejs5hLto9udMYpIf7Ax0bDIKUHXJqF7nwNgMmd7fqMK+Xf7fW+udg5do9l1kmp00BguHvEunbBZLc3CChaRw2UKzhcEH5y2xasjEG6iOS1wcKpZD50SX9rQq8E38JVcfyelYc/lr5B3NpqTkcHUJdkXnugvXX0wEq0fCpRQmT3I/7gQx13GkTJyE0NURiTPDaq3WYot9iRb+HsEDOC0HwMm+nd7OUKQhBjgHWxJIgkg7vrO3eTs7T3gFTQX+11y3Olea2pdhHarTlElxuB34DbcTPPA==; 31:ocGqIWuy+3LzWbdk9MUqP8Wb80Cr7o3wF0CBJxnqa16ocJ1avOkfecaDVMT0kSMwbROGw/wNK7oLTLUcdSPONBGXa+SR1TRKnHoNkGUCuDW+7nzlvQfYJwj47zl/BUlLec6DiRbSSnZKD78kRk01jjnES8DdIguIDhb0vNzLWyqyW7xr2AjOcPrP3JbLt0ZBV2XMrp2NKrj2k9ZrFumkh5sr+OoUWovnr6Yy9E/wZX4= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:oBHlg9D/fJfFS90YelgeTHPtt/p90dVRxfEaPcY4PLGH7uSAF7IGjOF1aax84CXkSug00t76XT7K1Nh/SX6w0dotTEoR8oG2OUKOZG4wrboNauv/4/iHJyrd6FlhZ3CO6NYqjVpqrhM16Hoiq+knwEbpCz7nODjBdCERYV9e+Mzp9uzXXhNyvowfqlnrpQc6f6kZkdV5Q523Vd0/orGwie9CNZVyqUfshjrKfNdn1ATC/mEgi+uVQ18W9YlUmPUa9X8r6b3YtpMIDznVfvOXDgMeevj6CgryKq8qCoVPWkWhglE1EC6uCDSDNr4K3LYGt2tcFJRSxmoVMY1cJuOl9w==; 4:bURU2Elzd+cUDzkldt4Xcgz6EJb+F7s6WivO+tO/TxKXI+UkD4HOG7mHcWHG/pzu2t10z58f5395HCwIlGBC+PokDElKKy84uxJ7jmWXCXEmagPUdaWPZZm27rBgxzgKC1i78Oc50SeNV5o+xoew+2ckedveHYGJfX3wSlxW0sMhmGbTO6cf/UZJHR0ViO1ytjLLVHWQihdiwTJjgHJ5AfxuROT+5PljTLpmwRD7BmxJGHLKFkRj6SDq68K+OIPoBwgTToNdHiV5QF5q3bWUXg== 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)(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)(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)(4326008)(386003)(305945005)(107886003)(25786009)(9686003)(7736002)(52396003)(16810700005)(53936002)(2906002)(6512007)(5660300001)(52116002)(478600001)(6506007)(36756003)(85772001)(309714004); 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:HskP2a9aM21kYv5+2zYjVdrSsbfJvPw31E2MULXFX?= g94hXXBxr+xtv/xDbIPM5t+U1CJgfvLLRm13uYoJoeD9QF4URPnFNc1tJD4CtWqnGiv40NO0fEyro0TLi0xcCQDw2T+CbFN0Bo6XclY0eGnBHwzNzkjze//4BIKny2BHFYNVnewpzrDVNqN/kdPveDlStxZPJ3UZs+yhvZ56p4AgeBYEBzdmS5qWhoXU/mVZ10tXFsoXeRs10sg2ufXTyegnuXQf0y3pDGkNIoLtFFrdF7dZ3Yo/pAggv675XvArLXkmUNoiiCpDSLJ3zz57dhXE2CVkBlp/2yl+Xr5w7DoobKp9vWhhY//N8Hkeeid+jXOP0w0LsQDc/30Pir4SIEW6oJFznkLjQugnHwRpM4w7rJ4KSplR+V8SjXMD9DXAAg3Wh1GfexJwyHWe+8nzySZDOHKGykTRXy1eTJasFmXK/ro6MIcpTzkORa9m/jrLsrTjCydRV7ek+uF7d/aw5pqz+iU/05/TKyfBEX+aYRW8XF5uj+PooM/TML89T48L6/3LOt9wetitSlMOk6MIOQSmxVpbS0gkz5b4XU+0cA4e04np35KZ1fWqyTXU0wATqbb3U8pck976SQtpxmmFzcUlhsdnZNh7qzFmViBGyBMxl/9vl0iPC7KMe3KJxF5AdXAKic4zmnkPPSMQEofIdTn3rhecobtdiCuMSjwGZtVyPVVlEOHJCJwKGpD+3T2CVeVr6iM/2GNHu9XLU+gXLjsEGO4wJjTM3+asUkRA46karZb4U2OuZBxiwrh8FWPlLsMn+2EtnsyM1ocnV/LHnkX0OnW8ahg9J3sCoAYbRb82VSGkGiSlzwC5kBDmbhmoQBoPElAretnbKVAAtERQEMLD+6U/05WhKcF2q4v7H9CA+brf6hyec9c63x6h2pnwwzboPLbeplZTIWuyW0masvMlWQ0a0OgBRWyQogqf7PkG/5WVF1rWuZGNDsnJyL+tTj5LpAZ5dxUFBUTqrsMwDh6l3M1XLrm/g1J1Mlh435PnC0gu6EXAukdW6a6Bbidg9iSi0Klep3FzdjLbwrrHUuMX2vsnfjcSgADURY/eYCXlF4IMYFXr4Kc+mAjA9jXsp6HdR2LMJrMUrZz92wX9Fs8Hj8o+RhCSYjUgC0AM1yTs7pnQaKZCGv6opXOGOTdE2Sb7FRzWgd6oXU/itaEkaeD6KC7DmNiUIFdTPC9aGcj8uduzoqegnCjTuEihT75lVIHM7jR8gPfG8cfKgJliyx2C7lyWigQR1MTJUohXh1X3bhv7MiW8NB4Qk2EgLAh2qE8RCj8RCsh0Umf6qRz4j5AGX/jBQg4u4kwgKLkdz5k1KsbSiiTdsQJtACAxOCAB0lX1JnY1Xj0Nji1E9uR2p4Gd8nk1+kHnJ38cjs9zPGr5A== X-Microsoft-Antispam-Message-Info: cLfrNVzMVNYARV6qUucyWMcFiXXLgNttZGyUxqB02hHdW2ZFBpUxu38Uv+a7u5giwKNKpjNVlGDmGyZe5eqqSwEqS5WbhL3wYcmmSUZtzaowpy1B1BEYyHHpeUuXuvJ+2kwfB6Fk6OjoTQhsvW2+/7TTje8pIQIS/5bEqbUkjjH74t+2BDb8rBofnnBgzqXw X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:Z04/uVTkqhDeEmy0BMoa0UenNhFuwmkf3JtKNU71ssXYvF1KgJ6tifuy+S8DkHFabQwTa9jIzsmBNA4QBCtCokcJuJ4wDQ8gkxDBvLXLrTWwg0cFw/QXGddDZrguo7w7aHwt4qeXNH+CyCNa/r0rtrJZanELsAuqABNjqCsJxv55G834hjUuBGav+w8EC3CMWgHEKAIHs2/5GotShz1vDeRAPMVqjMbb2mF5vxjtXUQNH72LxcL+Vrmml6NlEKGz+3gFKLZ/IH3XojPaReqTuNNOzMIOuOc4AiFZ29tZdQY5osykpJmDtasRYqz54tXGvbqtD8jYEptVvLmB1PFF+7atj2JSDOH4yiZgNpJAi34wp8/gp+ECj+qd3y2VEkgtDRFtXPop7Vu6xnCl5L/4GVl+MdFOhL9dDcBidWUmIxkS712ma7L2vJhx5CBmIkzGXrWaE2bTKQk0K8CR3jAf5A==; 5:n5J8hxJrVZuIfMaAkSCbRT9NHvRIHSC2XUpfR1i2gcwhob0fkvlygna1NUj6YzI04CroOgLnxuzKfHMXJ7sOlscKUMkczbCQ/mYWzl8asIL0j636cXMmUZG0iFI1pNd4lskPrFak9k9TrsQDRl5OgUnPBpU7GsjcJZRizin2Evw=; 24:Aqtamgqnyv+ckFqPYibGgTW7N2S2SzhVz/Yj+baDqDLlU62jepKOGSxMS96d2zOL1ks5YMflgN+KPgODsTJ57dl41NXOOEo5zKi1N07EX9M= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:11pArb8F37/i1rh0dFNPBkoLLIKZGZLyifJSIllZ9pYoOlO7ZRaPI82wrD9+MuerXOWASKRSW3yRs315f4cW3Wtfn2fgtv4QQP5o6E7lom/mYZ3/SHqPiU6+F9aXVYBVSNsGy8koMU4ILkuxHarSqoVToyBzaLyujmqv3hxTeU4rTss0PPT7f6y13NyztCtgwvTcV9D+KHhVfE9gxBzhfNsbC6edaSzGZH1vWQxy+G2ySzbyj4Z1rWTs/M79vccz X-MS-Office365-Filtering-Correlation-Id: b7de35db-a8f5-4853-3ce6-08d5a05ab2f7 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:34.4872 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b7de35db-a8f5-4853-3ce6-08d5a05ab2f7 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_024956_993364_D1EE4976 X-CRM114-Status: GOOD ( 14.65 ) 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 [104.47.1.47 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 mesh join function consitss of 2 parts which are preparing configurations and sending join event to driver. Since physical mesh join event could happen either right after mesh configuration is done or after CAC is done in case of DFS channel is used, factor out the function into 2 parts to reduce redundant calls. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 120 +++++++++++++++++++++----------------- wpa_supplicant/mesh.h | 1 + wpa_supplicant/wpa_supplicant_i.h | 1 + 3 files changed, 68 insertions(+), 54 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index c0c8f9131..f2f417dca 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -25,6 +25,7 @@ #include "mesh_mpm.h" #include "mesh_rsn.h" #include "mesh.h" +#include "drivers/driver_nl80211.h" static void wpa_supplicant_mesh_deinit(struct wpa_supplicant *wpa_s) @@ -359,13 +360,48 @@ void wpa_supplicant_mesh_add_scan_ie(struct wpa_supplicant *wpa_s, } +void wpas_join_mesh(struct wpa_supplicant *wpa_s) +{ + struct wpa_driver_mesh_join_params *params = wpa_s->mesh_params; + struct wpa_ssid *ssid = wpa_s->current_ssid; + int ret = 0; + + if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) { + wpa_s->pairwise_cipher = wpa_s->mesh_rsn->pairwise_cipher; + wpa_s->group_cipher = wpa_s->mesh_rsn->group_cipher; + wpa_s->mgmt_group_cipher = wpa_s->mesh_rsn->mgmt_group_cipher; + } + + if (wpa_s->ifmsh) { + params->ies = wpa_s->ifmsh->mconf->rsn_ie; + params->ie_len = wpa_s->ifmsh->mconf->rsn_ie_len; + params->basic_rates = wpa_s->ifmsh->basic_rates; + params->conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_HT_OP_MODE; + params->conf.ht_opmode = wpa_s->ifmsh->bss[0]->iface->ht_op_mode; + } + + ret = wpa_drv_join_mesh(wpa_s, params); + if (ret) + wpa_msg(wpa_s, MSG_ERROR, "mesh join error=%d\n", ret); + + /* hostapd sets the interface down until we associate */ + wpa_drv_set_operstate(wpa_s, 1); + + if (!ret) + wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); + + return; +} + + int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) { - struct wpa_driver_mesh_join_params params; + struct wpa_driver_mesh_join_params *params = + os_zalloc(sizeof(struct wpa_driver_mesh_join_params)); int ret = 0; - if (!ssid || !ssid->ssid || !ssid->ssid_len || !ssid->frequency) { + if (!ssid || !ssid->ssid || !ssid->ssid_len || !ssid->frequency || !params) { ret = -ENOENT; goto out; } @@ -376,22 +412,22 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, wpa_s->group_cipher = WPA_CIPHER_NONE; wpa_s->mgmt_group_cipher = 0; - os_memset(¶ms, 0, sizeof(params)); - params.meshid = ssid->ssid; - params.meshid_len = ssid->ssid_len; - ibss_mesh_setup_freq(wpa_s, ssid, ¶ms.freq); - wpa_s->mesh_ht_enabled = !!params.freq.ht_enabled; - wpa_s->mesh_vht_enabled = !!params.freq.vht_enabled; - if (params.freq.ht_enabled && params.freq.sec_channel_offset) - ssid->ht40 = params.freq.sec_channel_offset; + params->meshid = ssid->ssid; + params->meshid_len = ssid->ssid_len; + ibss_mesh_setup_freq(wpa_s, ssid, ¶ms->freq); + wpa_s->mesh_ht_enabled = !!params->freq.ht_enabled; + wpa_s->mesh_vht_enabled = !!params->freq.vht_enabled; + if (params->freq.ht_enabled && params->freq.sec_channel_offset) + ssid->ht40 = params->freq.sec_channel_offset; + if (wpa_s->mesh_vht_enabled) { ssid->vht = 1; - switch (params.freq.bandwidth) { + switch (params->freq.bandwidth) { case 80: - if (params.freq.center_freq2) { + if (params->freq.center_freq2) { ssid->max_oper_chwidth = VHT_CHANWIDTH_80P80MHZ; ssid->vht_center_freq2 = - params.freq.center_freq2; + params->freq.center_freq2; } else { ssid->max_oper_chwidth = VHT_CHANWIDTH_80MHZ; } @@ -405,67 +441,43 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, } } if (ssid->beacon_int > 0) - params.beacon_int = ssid->beacon_int; + params->beacon_int = ssid->beacon_int; else if (wpa_s->conf->beacon_int > 0) - params.beacon_int = wpa_s->conf->beacon_int; + params->beacon_int = wpa_s->conf->beacon_int; if (ssid->dtim_period > 0) - params.dtim_period = ssid->dtim_period; + params->dtim_period = ssid->dtim_period; else if (wpa_s->conf->dtim_period > 0) - params.dtim_period = wpa_s->conf->dtim_period; - params.conf.max_peer_links = wpa_s->conf->max_peer_links; + params->dtim_period = wpa_s->conf->dtim_period; + params->conf.max_peer_links = wpa_s->conf->max_peer_links; if (ssid->mesh_rssi_threshold < DEFAULT_MESH_RSSI_THRESHOLD) { - params.conf.rssi_threshold = ssid->mesh_rssi_threshold; - params.conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_RSSI_THRESHOLD; + params->conf.rssi_threshold = ssid->mesh_rssi_threshold; + params->conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_RSSI_THRESHOLD; } if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) { - params.flags |= WPA_DRIVER_MESH_FLAG_SAE_AUTH; - params.flags |= WPA_DRIVER_MESH_FLAG_AMPE; + params->flags |= WPA_DRIVER_MESH_FLAG_SAE_AUTH; + params->flags |= WPA_DRIVER_MESH_FLAG_AMPE; wpa_s->conf->user_mpm = 1; } if (wpa_s->conf->user_mpm) { - params.flags |= WPA_DRIVER_MESH_FLAG_USER_MPM; - params.conf.auto_plinks = 0; + params->flags |= WPA_DRIVER_MESH_FLAG_USER_MPM; + params->conf.auto_plinks = 0; } else { - params.flags |= WPA_DRIVER_MESH_FLAG_DRIVER_MPM; - params.conf.auto_plinks = 1; + params->flags |= WPA_DRIVER_MESH_FLAG_DRIVER_MPM; + params->conf.auto_plinks = 1; } - params.conf.peer_link_timeout = wpa_s->conf->mesh_max_inactivity; + params->conf.peer_link_timeout = wpa_s->conf->mesh_max_inactivity; - if (wpa_supplicant_mesh_init(wpa_s, ssid, ¶ms.freq)) { + wpa_s->mesh_params = params; + if (wpa_supplicant_mesh_init(wpa_s, ssid, ¶ms->freq)) { wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh"); wpa_drv_leave_mesh(wpa_s); ret = -1; goto out; } - if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) { - wpa_s->pairwise_cipher = wpa_s->mesh_rsn->pairwise_cipher; - wpa_s->group_cipher = wpa_s->mesh_rsn->group_cipher; - wpa_s->mgmt_group_cipher = wpa_s->mesh_rsn->mgmt_group_cipher; - } - - if (wpa_s->ifmsh) { - params.ies = wpa_s->ifmsh->mconf->rsn_ie; - params.ie_len = wpa_s->ifmsh->mconf->rsn_ie_len; - params.basic_rates = wpa_s->ifmsh->basic_rates; - params.conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_HT_OP_MODE; - params.conf.ht_opmode = wpa_s->ifmsh->bss[0]->iface->ht_op_mode; - } - - wpa_msg(wpa_s, MSG_INFO, "joining mesh %s", - wpa_ssid_txt(ssid->ssid, ssid->ssid_len)); - ret = wpa_drv_join_mesh(wpa_s, ¶ms); - if (ret) - wpa_msg(wpa_s, MSG_ERROR, "mesh join error=%d", ret); - - /* hostapd sets the interface down until we associate */ - wpa_drv_set_operstate(wpa_s, 1); - - if (!ret) - wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); - + wpas_join_mesh(wpa_s); out: return ret; } diff --git a/wpa_supplicant/mesh.h b/wpa_supplicant/mesh.h index 7317083c9..2e2f3cfbf 100644 --- a/wpa_supplicant/mesh.h +++ b/wpa_supplicant/mesh.h @@ -21,6 +21,7 @@ int wpas_mesh_add_interface(struct wpa_supplicant *wpa_s, char *ifname, int wpas_mesh_peer_remove(struct wpa_supplicant *wpa_s, const u8 *addr); int wpas_mesh_peer_add(struct wpa_supplicant *wpa_s, const u8 *addr, int duration); +void wpas_join_mesh(struct wpa_supplicant *wpa_s); #ifdef CONFIG_MESH diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index d5bfa7ddf..ab5f88f66 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -810,6 +810,7 @@ struct wpa_supplicant { unsigned int mesh_if_created:1; unsigned int mesh_ht_enabled:1; unsigned int mesh_vht_enabled:1; + struct wpa_driver_mesh_join_params *mesh_params; #ifdef CONFIG_PMKSA_CACHE_EXTERNAL /* struct external_pmksa_cache::list */ struct dl_list mesh_external_pmksa_cache; From patchwork Thu Apr 12 09:48:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897583 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="QVrshKXb"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="T5KRL1QT"; 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 40MGNl0LGqz9s2R for ; Thu, 12 Apr 2018 19:50:15 +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=a3GdAM4vTItC55lAWaKUTaQo+nCtQMfel1rtIPMIUEs=; b=QVrshKXbxxCq9c Meac9Z25P4qjylZ9TXJIgSycOah1Jn4FAeQrX4XbQSNAf6quqIRav/wTJJISWCuekdBVGw07NAexG 9f6jIB+FZ/so9s1gVL0crI1JgQtVtnQprxGRAv0BT1IgTyqVkh9DTVWYsLRQzckjhxd5DMc30Nvd5 WsPKrMJ2dfF/8EWVnBFhyKIwnJznI5FjD+0ssZ8NPcOp/tNNA6L2KWUxSEOrg1SnnIFCUUvQRw+Gy Exhfrw6h89jPGUc2v2bMslnozh+E4MAcBc1bW9gx5dpe+ezPMvQ6GoClKdUb3fuUtibvTM5WbJzK+ 2zy2DrY82ef6oEnTJP7Q==; 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 1f6Yrp-0005EH-MA; Thu, 12 Apr 2018 09:50:09 +0000 Received: from mail-ve1eur01on0082.outbound.protection.outlook.com ([104.47.1.82] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6YrV-0004Or-0P for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:49:50 +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=Rd/jeKBfYSW3cBPJtjO2JwU+XywnKYqICsk6ko78TIQ=; b=T5KRL1QTwrRnuje2PpuNIQB6VbobMnZ60F9IOY6cUUOjb7QZvlKkkSgEBKNHoV6W3UdPzZnFHeu/z4yxukVfWMZz9G+f1K1ZPCIyqePko+CFDr/JLsM1uTd/DYbCDKGIQ3yvz+ldyHOGm+vYyewBFzdM1P03pDNTBMuqtaMxgWo= 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:36 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 02/15] mesh: factor out rsn initialization Date: Thu, 12 Apr 2018 02:48:59 -0700 Message-Id: <1296a42e233d30603a082a265e345c521ff3f573.1523526306.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:BWMHpxpYgqzrmXyHLK+7F98rsztwzTF+h+NvHSSSKj3UbXrkT4e3kL7fd/0u73MYCUyfdx5bfMD+21nchq4Q72Fi8KfxECi14utqay8BrJqgeMklLxvtE/UAwRgRF2U8mUH1DTYiU7s20PLJc4yioa2e/s7dyjUAH6AmgfkNdZAzEjswL4u+JffzW24TcfCGJLfG6wpJ0ymTNdlIzcFJ7CQ4chlOS7HqGkQHH9ggSqAJJr12pHPWGB3W6KBGk4kA; 25:5uMVJV7E7tc5Qvrc+vTd3gl7wgCZ92umeHoVGRpQv9W916/NHOYCPWrSuCLtr/rbMlEoNOuwZqJcIrvn9knDAx1Xus1K0D6qvlXvAkv+d5qSzE2jKvxPsHsYwAS8reXbv0rdGgaspatOd0o4QuaMK8b8aT8/RJrafrT+bGjHeCIO/83QJhYNNvHuZxBBnRaqLuliQ0h1XJtgLT7r+ncJd6jrnWovFi1/7fCUPrOLlurWNYMMYsNAaIfKTRVi3Bk8/pWV9cUvh5Iga5HKizdVGv6jpZ/j98gUR2UMzLk3kw7CmdYET7uTcXUdgpEQDc4vLlSIXMDLMeEyzLxKAlHq1A==; 31:KQqJza+eq9dkHWdjsR0T16Ky5s14YlxRjaoWHMDlYk5anWA3SX8hqFwGv3f7qcG6u/VMcY5PhKN99/R9oqaVjLT1E3REPoLHkcNqq8J3IHq2mqahckxxt0SyX1JZJTyzVBQ5r00UMxIiLJGJEkVJXQJGwLKorVi6vNsFJaubG++cEqNpfX7hsfHJkqRBdC12EeoYtBKAUa8x5yfNjTuXgziULg7ROoXlt6opzqMxJms= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:vPrSmmLIgtCy95bQNxopA/kUVmsS4ozBwYayrGz3mzQ1WU3Tuci4fbX99aYYWba/Xlhu39qZlw1DkqZ22YvgxbIr0j3eWVf3mrRiOwo5A9DIfEG+tUoLp17M4r1vilYxVto3oDWj5oHBkjcaHax1n+e734IRd1O6EHTwrpgvU4GNCq8OnC0Io26uFHDNVoFsDh/7OFhxGQqtdAc6F+kO5SwKyX4SuvNjxNZ7Ofw2Bqu5z9KRfTbD6Kfap8uDPObYrISawASt2cdyeqAs5Xxps40/jPybPh7pVGmzjUF/nDAjhfpNIL1iemTmsr9xC7jNNyIOmZAO6YRuE1i/SR4AsA==; 4:WuBqQX3e7cToU1S4Z7RA7ZMPfNKwC67FLRzo++gURmQKoMZ1Yb2HKvOI7dm9GLTzTvxJuw2YFToJdgQCiOV+HdKlK0hdalmSRxmopCtGggtAJMhP2fNoJOSJGSuoXBUvZke31sShTR7mj1xnEePDMcaREz/co65FGHOKV+YpSxJcVN7HLuPSrCW/0TQYVHZl/SAfGnhuJCMH60fRA2O4rKSfIKuxweEhBr1U1EbNT3+RQ7nDgbiOUtnBJxwGthk8nXIX5chWbTNICPjq+p97ceV+Z70jWXPzyNs7ah8qVSsrMdcI4ftE9mzFnuR/OlYf X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192374486261705); 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)(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:NLq3dDSPgEVxuvtpoY5a/Csm4mky5hVI+1TYSY6MI?= bXL0ROFJxawRbYiTNfkf457j7UApyijb8YTrLwcTUDWwQ6MgoIXyIOblTrx52ENJ1gZDi/SH+BhhrUAevTiUg7wIyyEO8e8Yxtzxmr0gwQcorINTgBUwzYOKJWSnZFtLMu/rWeYsYEhFeP2ropJpR5EipsT/0Lt+kubQ2U2ToDuqGCU48zoffiFeAKefbrD4ISzBo7lwAhboYHDggjKIPU6w8fDqrbX7pLRYCYftqnfmWwZevbj1+qB+NH985MVRAyF32ALv5aWrG+rYLfoUQ5N/EcFj8Cgi6wQ6r0V7mziSOQgu/q9C7h5WoE9q7qTXWMh7t2Gtr7/B4kSbYjdlqpNfLPT9D8qhQuOcQkJ8URgqN01vyEEwowx8nUXynoMrZSbJrmVEszo4eDBJ/51dccDQPRdWHilOFhc+fqWB9ecLfWdVXbMuOtu8HJOuSNLjm6v5h9hIIOGgHPlX+Gp+RfNne/ZpJ+GUU3UCnKEnjxZtpFpZhknv9XX3hKGCVDX/R6+n0XL7i4eq5TJt9iRh/VB0RHvWyjzXVe2SkvuJ7NczxysGDULGkHsMf/liqDRhEe4OTJ8LFfRRF3XoEAYMyLau2fMElRaFqXpteRGTVkfLRmPqPfVnn6hoEryxzhtRQ0skTp3LIJFmUXXuzqAYZVDeGdgbQznLyR7EUQStqikC2K4albbnaS1iN/t/p/Q8E5ZFfpz5ep9kNhUsEcqq2CYmB5xboou1Ti9cBZ/xikWFyuS9Hj5WAE6arWDXSiG1e9i7nhXqWWXob4LXGVBEdsAn0rjX+5z4Zf8VXUaWLG0ll1VfUFLr8JorioR2rszZqkOgKoI8hymxhq8XsAX40UK5Smr4USr+gnQTPJnN4woe9qltjcxQwmM2ylBtIUjBGY4Ir6PhgCvhJmu2IwsFPX48uUOd4+8ovykDWleurWKt8lDg4XMMHmo/6pBGkduzZ7VCv+ot1Q0bNq54603FBWu7DyI4yisdBobDkrWYuwPn9KyHGoWEDz98QSWUz8Gk/iiTX4rfGByQSv971SI+eZ0N7jd4gNKDRLlWnbTUxMipF9WhYA/ROB7jXvEE9bspWx2nTWye2m8q9SOUJxCQw+oM9JBzBElmaE/YPYHg/b3z3TDcoXjknVaNREkESGQs2RIPx+NaghWRd6VnvWy6Fg0jQx4rHTgI1iY5+EiWO9ca8D0Xt2uCURUNlnRLT4pqxdIlwva89yc8ydIk+dL8rWjyPNQaAUF1aVoeLxpE+IoSLYkSpV+9tlBKQsOsIyu5YjrcFKR3iqz2Ap05hSaUgPT5jfHasbVONw1wMPcFzWg6XXRgnGW7XRIkMk0D7BBnKX84hHmtn9kaB67h3pJIjwGW4zbmdW3vFH3vVjsaWF4Dw== X-Microsoft-Antispam-Message-Info: dHguWeHCkX2UB1uUkOlA+HkKpYkJK4OltFNFCnX148kcKek2jGFTfRgq24LFqz9S6NKZaQYOOAoNHE5ecXsw39OFfDaqwPGlyOFjnIBMWanov5cn2DHSxAlOQuMIOfxvSyc1kPt+ZNVfyBbhtDDzq++q27apzovNMuKwFvYBaThj51Yb6J4wOAeaVzPuByAh X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:GZtYituxnfJ6xyuXRAJDslnXxhy15AeKnpHITU/RtNNnFLMmKCcKqog0jvQR787Hi5cFCtUggC0w1arfgoh2xwwc2r4HtEbk5qiBdlf1oVq8FufWlmCCCg8yQlj/Hp1PLvgxSjygqzJ3niUYFDzdPOS1vlIAIFfq5uVALsyg8NNekMmjmtBgeCwW/VeZabXfeZrp6tMa6bS9xn08qLtpcES16KlpJZV+k0TbK85QlpIJ6Y6rV2mAoEOJ6N9Gx44eluxDL+duyccpVr1o5tdVJDoOa6X0sXa99mU+MLTV7WBFd5UeBCSL/MPIWxILbKzEvNTtSSq9mj9htcE84P8sPDyMk7pkRJa4Hoi6LSjN1otBrosjznX4239z2YUMnMhhfvHXRrfh2xc6LiIaR63AfHLAiBdjb6uR8q9jiW6Y1sakqXQ35+ZyeZwbVLr8HFYi11kJ+KX5fIHxMjB6ur9Ubg==; 5:c7J7s+DsJoNDIaOkNzNf6yXngfHpfhWAqTu8uY43JuEnHbiNG2nO7YiF2WWlIlsmEQQ6MZMDEh4iPFUTT5V/vudjWjWVld4VDYgBedH46E5K4D8/O+YtCjwX3a7enF1Sr7YEG9XHpfwY/iendvDktfr7EI4kTgwjx8kbjzvUVQk=; 24:ZbULqtEKvH74zPX8Iz0yy/ryQ2D9hLz9GFVpKAJTFpU64Ei0f0kzmeh0eWNUfSiYUQ9LzQ99BON428QFyqby10FyRlpFYtRie5B04gDQqFI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:e0wwV57rPCON02hG2qGnV4yToX2l916YSZ3wxIRECTDnnFY5Xpa7fnmJRdfROg4zATHotZjJ6ezxcUqnHaIf/MPLL/i3zRqO0UIt9x/qbg/IaJnCkZJLzaU6kK11J+HQqgxIAb3YbLXiotcaz088gtOv3R072v7imIZ9qaUkKibQ8iQj03+Jv9DBJ+Q+y1v1zOVvcHvwenivcSTFNn+h6FciLnDQu6/fxfR8+nn4Vzeps4pGkY9gFENKNsJXq5iB X-MS-Office365-Filtering-Correlation-Id: a2770aae-9d20-424a-97fd-08d5a05ab3f1 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:36.1279 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2770aae-9d20-424a-97fd-08d5a05ab3f1 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_024949_066549_A1AB6103 X-CRM114-Status: GOOD ( 12.30 ) 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 [104.47.1.82 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 RSN initialization can be used in different phases if mesh initialization and mesh join don't happen in sequence such as DFS CAC is done in between, hence factor it out to help convering the case. Signed-off-by: Peter Oh Signed-off-by: Daniel Golle --- wpa_supplicant/mesh.c | 73 +++++++++++++++++++++++++++++++-------------------- wpa_supplicant/mesh.h | 1 + 2 files changed, 45 insertions(+), 29 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index f2f417dca..8e0d5ebff 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -147,6 +147,48 @@ static void wpas_mesh_copy_groups(struct hostapd_data *bss, groups_size); } +int wpas_mesh_init_rsn(struct wpa_supplicant *wpa_s) +{ + struct hostapd_iface *ifmsh = wpa_s->ifmsh; + struct mesh_conf *mconf = wpa_s->ifmsh->mconf; + struct wpa_ssid *ssid = wpa_s->current_ssid; + struct hostapd_data *bss = ifmsh->bss[0]; + static int default_groups[] = { 19, 20, 21, 25, 26, -1 }; + size_t len; + + if (mconf->security != MESH_CONF_SEC_NONE) { + if (ssid->passphrase == NULL) { + wpa_printf(MSG_ERROR, + "mesh: Passphrase for SAE not configured"); + return -1; + } + + bss->conf->wpa = ssid->proto; + bss->conf->wpa_key_mgmt = ssid->key_mgmt; + + if (wpa_s->conf->sae_groups && + wpa_s->conf->sae_groups[0] > 0) { + wpas_mesh_copy_groups(bss, wpa_s); + } else { + bss->conf->sae_groups = + os_memdup(default_groups, + sizeof(default_groups)); + if (!bss->conf->sae_groups) + return -1; + } + + len = os_strlen(ssid->passphrase); + bss->conf->ssid.wpa_passphrase = + dup_binstr(ssid->passphrase, len); + + wpa_s->mesh_rsn = mesh_rsn_auth_init(wpa_s, mconf); + if (!wpa_s->mesh_rsn) + return -1; + } + + return 0; +} + static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid, @@ -291,35 +333,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, return -1; } - if (mconf->security != MESH_CONF_SEC_NONE) { - if (ssid->passphrase == NULL) { - wpa_printf(MSG_ERROR, - "mesh: Passphrase for SAE not configured"); - goto out_free; - } - - bss->conf->wpa = ssid->proto; - bss->conf->wpa_key_mgmt = ssid->key_mgmt; - - if (wpa_s->conf->sae_groups && - wpa_s->conf->sae_groups[0] > 0) { - wpas_mesh_copy_groups(bss, wpa_s); - } else { - bss->conf->sae_groups = - os_memdup(default_groups, - sizeof(default_groups)); - if (!bss->conf->sae_groups) - goto out_free; - } - - len = os_strlen(ssid->passphrase); - bss->conf->ssid.wpa_passphrase = - dup_binstr(ssid->passphrase, len); - - wpa_s->mesh_rsn = mesh_rsn_auth_init(wpa_s, mconf); - if (!wpa_s->mesh_rsn) - goto out_free; - } + if (wpas_mesh_init_rsn(wpa_s)) + goto out_free; wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); diff --git a/wpa_supplicant/mesh.h b/wpa_supplicant/mesh.h index 2e2f3cfbf..995210236 100644 --- a/wpa_supplicant/mesh.h +++ b/wpa_supplicant/mesh.h @@ -22,6 +22,7 @@ int wpas_mesh_peer_remove(struct wpa_supplicant *wpa_s, const u8 *addr); int wpas_mesh_peer_add(struct wpa_supplicant *wpa_s, const u8 *addr, int duration); void wpas_join_mesh(struct wpa_supplicant *wpa_s); +int wpas_mesh_init_rsn(struct wpa_supplicant *wpa_s); #ifdef CONFIG_MESH From patchwork Thu Apr 12 09:49:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897584 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="gOYYQE/U"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="EYNZQyXi"; 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 40MGP51FDYz9s1R for ; Thu, 12 Apr 2018 19:50:33 +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=TLBaCK1wmTMm1hB8RH+bWVU21Ak4FGP/A0HuWB7QKYA=; b=gOYYQE/UsjGDxV SyUS4aDpF1KCdHUlopPYW7kn64IRTEeXzauLusmPP3Ecq1baK+ngrqtS0FjUIE+3xvZWbmvcJ1cn2 q1Go/esxW7IaU8DSABsLszDlkPcicBOeBWTNbN4lQSakx1+MvQ7UxCd4UVfQViolA982VDVeSEqrE k5iQdQtQWT5BAse+s9+3hV24Eppw29FPqwrVhNTg67ITHhCtOF0QNUEmqzOJox9JYzZbJ4uBkUzJL Aqd9qSxTigyZIzLdN27YBuhOv3RHz3bt69rDw6tiudbbGaw7MttwJm0f17deK3eKbNnrAR12lpEmz gWJoaWAItaGNMFV8g6ZA==; 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 1f6Ys9-00061M-D3; Thu, 12 Apr 2018 09:50:29 +0000 Received: from mail-ve1eur01on0082.outbound.protection.outlook.com ([104.47.1.82] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6YrX-0004Or-0q for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:49:52 +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=hkBYaaReTyAwaeIyPKCxEPBJ6aVqOGD0XJWyaaiHs4w=; b=EYNZQyXi/HyXSfjiSqEO1uHQpsRaRh+V0/WWdk6ydyG7AuS4rTRsBgfaF1HJ2LqPYxtnMNERUBeCYEdYt8IbgONv+YszRSpC7YYBGpTdukum+MTdFlNVEcOcAxeMvTxzKDhP8eEHHDs8tySvGfeOQDWBPcTdHqb7RQqBFS2Yy4Y= 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:37 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 03/15] mesh: relocate RSN init function Date: Thu, 12 Apr 2018 02:49:00 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:eWB4sZnyZu8vnUpZQOi1TFVWaSB4rUPHjc6aLTOk65nUf8NNiaX7J7nycYCZ1wQBjQrGlgsz40i8dIuppHdJpEr6MyA0LsYAvHwB2AMzaiYz0ZX7iMuUaoEibYH/i2UTq/aNJXAy321fQK72Iae5l72aCrj3NFoxPttkuPh2vYEH3erDa3p/XRHGCMklcth/F9gVeLi7VYDSBqbuane/irnqG8eOOv0PxwuYWjbsv+cNyccpKoh9h9i0leIVCnTX; 25:M6LiUyOjVPzyOA42EU93Sq89ipQ11ADM0EKnp9OQrtfyxDt7pIfB4mX0ddlUXL+KBdhIVsFQvAqg2Xv3YA7s9W8BJelnzded1/kQQhAwkSi92YDvbKAwAZCB6dEiujNd5TQrxA5UXkNzesLDfwUysQimJc0b919bRsTIc5X2aYPiQyYqckjBvZ2MG/4KPqTVLhwf4eBKD6+OvOrnU1voQagP8tv7Gx2bYubkc1srKCKkzezHLyc2k3AUnEETFxYqcuS0lVhWKakbRbAAeVvhLt8pegZvtP2smRFvOByPPKrpSmlod66/bABhwZFYQHeLNfK4cNgoDuHds9Fntc/Hzw==; 31:cqo0SDM9Vm7yT6t0X4mXrfLJ5jWum5gossFID8JkM4hkBN+Q69abeuKW4EW76eIhcL61hgShD/v++YPjGqMECRvgNsk/xLxXjsc2ms/yoJvu+umx5mqMJjf0+d/7LjCIvuc3WGoGivm6J8xVjUdreiTbeR0yi/xuZHDk3GT6kqa3AQLP/rt4l1AdkXXPfKGCRiwbdWtcAkK3IeRr8nmufum8zOUflfFlygY6ShMMuvQ= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:V/8AyEh9ca9K9VqTO2tuvcnxvyGKoEbIGAPcCZRonLXW35gQfAIFmV6A4JF6zrC6U5CcQu2xGZhUdy66P1ghkejYJBFlP7feAr5pkFKE97Z0KllOFF14017VPKwRICKsP3Lvx7WcfVlAYCbyDEei+Y8taVY6p8aFB0J13ZFgPAGeiqLQQGpBjUUC3NBf7fQ/n1G7i5MWPx/sjLgFBKJbAJUP3auchOrtB456TGa8EpqYVKxv3faZAw63Z7ROFN3k2NKMAnzGP20PTTFuU1vunp/7rRCDcePq0fun5jsI7zMdSE9zUgMwPHoRVPj78i9q/TjRZ2y0h5EM1ywuP2ittg==; 4:yr4m5Y8X6zWHdCN0sTcgT/cxHzqcd8aJVqFSKKSVHWEFF5gW1HkhlQiqJHZ1rXOPgMeb1eV6nXek4bVyT2bMAeQtsPzxdR97C3OKgEb1rCnFMjNjlFPGFkkloD2q9x0QYBcqyqz7i3Jn0bNtEJ9KGdhaZWb5IZHSfVKY0Gatbat6ZgpsZae2bu5Fp82+T+DRt1o9kdVCyxOxldwz1eOSAvhJMidpfVav5hERu0lO4G/ztsx3C4o6xhCFKNvbF/cjK2BjUx0iAAu1Z8tIv2SVfw== 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)(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)(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)(4326008)(386003)(305945005)(107886003)(25786009)(9686003)(7736002)(52396003)(16810700005)(53936002)(2906002)(6512007)(5660300001)(52116002)(478600001)(6506007)(36756003)(3714002)(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:bGy8iHr2P6PVQqspXA65V60a5OgcxZYoQEu6kCTKk?= Yid1kDXyEKDs7cL1rykQ+3ltPwU0HvXo+aBqPTE2ewQrstCCzSzDbvocxuv5sRflQWa7gJYqzeG+YU0NcSWADVuQ/A8Ky+s6HrBIBU8ocKif1ve8lv1Pz81wKO/GDbdiOq0OQfoLqsQy87SgFAmW+UFoRzaus35RvnnciTeewEV2Estg5a+bSzVOlipQWF6ZVlEmWnbTjXQPNEjvUfRxFsnRmGO543M55hX7Yc508RI6s8CppUrEucWY8Cql+AubyH97HGf4QP2LDNVBmLi3NLY6vbc5A309q9mUjU8c+AGkWf1BowoMS7fltsIbJPSi+J1/jOWDlC32WpT5wTEbamn0UGhvV2BvFiVgy9YHCO38FTckguNolNq4l0qFYs3SZZ8a+qxf6IQUxevbsPA0vu60wTd+QjD1Hifns621iaIrogDKlPMc1iwdTkWX9UeGfJPdfHWq1ge4dHDf1qh5imqxoCRW/rrh0J+fqJlR6uQSB9BltLwoWN+aeaePL5wSubQpS/qphZZn0MebtE1zLUyy4aZ24FINEtenSoSmmMQoWRsF7veK1TkHornNL+TaSuErRD6E3lKSnyZKoXY6dNZU089PFmcoTOfjp1WJuWq5ijaxW3vSVy+n0t6k3F6F7c21pJTs0RzJby8ASdKrpFG2dPaXmDTTFgtLanlvln7VESY2k6DwprqWrcfJhn7+kf/dfMbaKJSOhLYUlobynix+nNVIm0a6eZ+yvfAiug1KMXPqXYSoq/AFRfeTt2YwYJGS22cRWG9yoxq5dE+f9ofsknsABPcaSVikJAfTxsO6RuCQgtrg8Z/PAhR8oukIumSUDlysqCAo3b48Zwvz4dxVxWyra0htFvjCEUd5ibp94OuBUt4SdbugKkUqo6szFr0+rlINUpnixtkV3IpY2XZWPo2EqNYW6c8fJEyofZqeVV49CjMfEUhqNQ2GglDmbyBMBnWcX9s9JPC3yA45Hyj2cqsIhij3G5zhc3EXOO6FCKRh7E93TrUjEQo5YtgjN61skKah21Qoq/IzoQol0KFHFrFSLI8Ot/Whyc61V0GYaXmB2dcyDnupI8mSKEvgIb7WctpT6UUicUBFVb0rljYVUCzX/vaZZqvff7ltODVQbgmSx1L9enYbyWhK9MAM7ACEGNXNmVcL3BY6eNvTw6MStgPpqoSfk4ryArf1ZVSn7WctcVQssHOnx7Mj2G1gRMIj5tkbRUs5A5XMQs03mrT8Hiq/lgh/KlJjWGgPitd1pq5/FGZhyjfZNZ99IwUNVldxq8xk5JyPlbbXVVguEI75BNSaKfLWsmibpmoZFdXlsxGclsgtnulaHOMYTmXALHZPPtFV6gG/2SswSdcMCctGi51DZH+bpCONxv+tchdjg== X-Microsoft-Antispam-Message-Info: ZTMPBKUYoOteVRbx7K0lnaWwkagA7r0n9sSqKWBfWRHWNFxh+1y1V+1VNQKKKVNQa4m0ahiGTFhX7c2IR0feAWDmVtpGeDx7evusU+LAt4Vky+wBbTct7Jyj1u6neE9LSOgQe1/6WqlIDf+wNZX7hAyekYyqfXF4emEXbtHKYeDUgHe0Ipg+V5Uhj7c/to8f X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:RoA9maD+iMUQ1yDJ19aij5W3L6vlQys8Szfz8IuwggfEtOCVsPLmcTmjZDNUFvA4uxlyIgBIrjEb7kEy5p+6WGHC38tuMK+TpKLvpLtcpUPvtbqdM3JlErGKJHBCVhBDl4EWHvcsdnXNbaTTCXq20W6Br+Qk1u81EXeNf9rPLmXlNP2h4g22RPIyS3SDp7iRjQvX9tb3EgD+22AA6XflSi7l7TNWJ+h+IitGSgIfNo4DIIx5IpYExvFN/mOPNO8+ESYmcWsxqdH35zcRvOvktv9NrDdnfFIZoHyG3MsnYiASol04Oxyvga4w/NEmyIpd7eT2foHWF/JjCAqXrslvyBl0Zde0r1T8qCLUX1Ktp38IznhDEOGnjoypPXUAovKfkf6m+Oqgj9QT+FDAZPYqG8OgxkrgtqEho5R+oiXKnbb20QbEYXzS/xmkmsuGO7CYFrwMFw8dsJyTkCcYtGWG8g==; 5:jATLbqJ/N1OqY+Lb2R9rLhWW52ms1KLrwT5fPH/zBLPktfCjf0zBRg7ZhBI65MUJci56k91eeYdm/Byg3w4yNfXeonQKgCPSnWMl+hqtEMacVIyiEpovGtHRI5SbM9GU5pruDCXIrksU37T6gvKPAx/uodYPse+/C81ubMTtIKQ=; 24:dschLus3elV1MOCdiYidGoNBUCG78hc0mpc2CEXk8E3wtmp7L0nCvzOskYrPhe/Zu+iDnAbF9uVefpkYf/5m3Jt8zSOCr9SKegEy57dUB+w= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:IF95ijCGRxo9TLE6YBCfkOpPrdvnnwBnTMJi1CXBEyTvLaOpKI1195ZIIqddFvSa/wIOniKJLsnn03ynvWofX0IZPYVS2ieflMB1g1nthZjIsg/5wHWluYnae9RqKtznsrIrrhmmBFTKpa5zcnsw1e28dUOd2ucRfJ8z1GBQKfRNmCVrDF31E4Q0hPo2xhp5V8wnMq8NIfpSRdj+d/Jdzx97XmbxsecgfzWaATTZHHJTb69liysfU+g8zNHP3to/ X-MS-Office365-Filtering-Correlation-Id: 56d8712c-6194-430e-4243-08d5a05ab4db X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:37.6592 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 56d8712c-6194-430e-4243-08d5a05ab4db 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_024951_110958_508F80C1 X-CRM114-Status: GOOD ( 11.12 ) 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 [104.47.1.82 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 RSN init function should work together with mesh join when it's used. Since mesh join could be called at different stage if DFS channel is used, relocate the function to mesh join. It is still the same call flows of mesh join before this changes if non-DFS channels are used, hence no side effect will occur. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 8e0d5ebff..88001a1bd 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -333,9 +333,6 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, return -1; } - if (wpas_mesh_init_rsn(wpa_s)) - goto out_free; - wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); return 0; @@ -381,6 +378,12 @@ void wpas_join_mesh(struct wpa_supplicant *wpa_s) struct wpa_ssid *ssid = wpa_s->current_ssid; int ret = 0; + if (wpas_mesh_init_rsn(wpa_s)) { + wpa_printf(MSG_ERROR, "Init RSN failed. Deinit mesh..."); + wpa_supplicant_mesh_deinit(wpa_s); + return; + } + if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) { wpa_s->pairwise_cipher = wpa_s->mesh_rsn->pairwise_cipher; wpa_s->group_cipher = wpa_s->mesh_rsn->group_cipher; From patchwork Thu Apr 12 09:49:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897585 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="ejs4TlX9"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="cWWYVfc3"; 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 40MGPH54HTz9s2R for ; Thu, 12 Apr 2018 19:50:43 +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=KH5oseCEIyZe8liCoTgBgH0xAyFEp/bFZwdzda2eccU=; b=ejs4TlX90sucI6 PYFwAlNotQjFOGB424W3f9DQrb7yLLghKE0OtKpEQZmIvIVqCRNSsqJ2FZ6rBNS2AP0Vik2kAHOEl +L2A36sVDcHX3+WM9zWF/6O/XTA8pPlZTn4QPxJd5HWz6c/hBWBV9gJKvyV1TzBCNu7bEeuWfW8fT 5g6KciAnO/3HxTV4x6fpG0Fb2MrQleyoWlSlUmOSA/xZdbGyqh4UM7Ezmik22waWjF9F/44VvG7yP l3zlZ8cd1s/zfJr3kOcR3cOeTXNmCQ3Gk0ZneiFQSr0Z64fBclKPlszQ87iRyKB4ljpoAu4hFmy2H ikIA5KuRcpU/QmTWxiFA==; 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 1f6YsL-00068O-9a; Thu, 12 Apr 2018 09:50:41 +0000 Received: from mail-ve1eur01on0082.outbound.protection.outlook.com ([104.47.1.82] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6YrZ-0004Or-Tn for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:49:55 +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=qkIokgFPJFYyNCi1/yTFh6IOB5JvQIW5+9/kWA3dMy8=; b=cWWYVfc3U2wXArxVhti7WLwd1PsTvVMSaKq58nutfdEO8MqxMNyKr1GERraQ4kzTBBdSV+uBEHabufZO3Ou52KoIEFke/3krhDpxdVYehdciF1J2VIlgoOgCmSHXsRck5sbWBc6NN0mgG1WEtx3tI3iAdt71UNWzXyyUn1YlCxE= 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:38 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 04/15] mesh: use setup completion callback to complete mesh join Date: Thu, 12 Apr 2018 02:49:01 -0700 Message-Id: <7324d8b5557dee9ed8ad43c874d67cefcaedeadb.1523526306.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:YO9LpxosdAKBc46IaL5g2Fe24IQ8Y4U0Rbgw3Y53Z20ZuOIGSOHz3XgoPWhqOKLn/oXc2tP3R9PFSrN0/wXYCbjHMwLHRgiwtpdFES2d6P9kkeuEzCTtYIcxkfrTWQDMz8oY7wxj7R97Qadxlv2GWvDyOQwoPlyCJFYzBuzJT7lgW3TS48wVsjvXytMF8D1es4qHhWHfEjKEDlgBshVtbjUd6Wbq6ah1gJopmcqWJx97TLSYXxdvcprMauw1EErf; 25:5DxMesZbqAWi4v/+3QMiMeTXz9nByB0vK71k7xLp7DUz8abnglLdCtNGw6s5If2mF1K4oFfZ/LTkIWMLPCyCUJFckxu0yv2CcoOUpMxr0JXAMNQpIyuYT5kaOsbKfYVBPLfVMllKbR1fLmOqMWsmeSLQsgU8bo9Y6e/ENJSeg45d3GPIGhrQSBeXUghJQii2z6g81WiljEHPkBhQFpQDM/mP2Hc8QfX0zQSweXMWeLOQPRt5EBNUAv2fxwushBwSsru9CIIp/OVBZtKfqiuT+li0P3x4BoYdzLhJcXVh8zDaE0ogQD7ry6fLH6avWymPA7j7eqct6WYuj9A3hOqBEA==; 31:VF8By30GbO8B6ct5ZSnwXwtSRDa245NytzABEmBPtZACgI9YapZF+nFT0iSpUKyQnrRMY+AJhTD2Ua6V++N3NailrBP5tZIOGe3r0J94WELQ2+3kxr0yd972Jjv/OOy3MML1DmtaVlElzaRyPCypbzU4mXvyp4uMMwBRWIg8jqgWUsWtcHfvcc/v+3DBL/WWpg+YBJqj6ir49DwXQzJ7k/lN3MsVqaxKdkq32BoHSX4= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:YjA6kY9sEh5ay61fZneY8OEMQauRNf/EuyErbkGY3rutsqAwT0Bi+FU+aezWGmixxfBOZzHgMHCeGe4rWG7ReDQnswCPJ23eDe5iBeXR/OBp+OxpnvZO2SQQF9LNWydRFGmPxFRGpghyezJuArMcCszS79O+1Yhz1Gu6NvVB03PqTztxJtDNZg1xV+c4Jitc4z9MkjkrxVV0Pv22sxRsib7vKeVdk/OHnKzXEm9CF2zKXPaL1loFe/RADNd7v7eQpd7UAN4oSVIgG5JE5BL7qj7xrt9FpAsKJJk/N872nGmRJoGee4XW7LZ7a8fZfhijBq6BuJu2t64y8lszMQHB+g==; 4:1NrBZ0gh4mtsSULcH3BeRrAgMIoFjXIAnNib9ZYktaXT5lplEbhNuXADEs2V5hs4Yn8hWy/hGWBkD/iRtKQYcF5XogwJQIGSPn2X4llE4nXhDFwoubyN54qPsIBcLjcH9d1BvFLAhbj8I11+EobrqGKLHqjuFREDXUInESR99XeGN1fbKDsUNW85KoP/0PP7TKhVSgbo6mvhbeLe+HSbloujIDtlCjutTKL4RrMP+qWzDV8ub0NO3DgiyD9fLfctJknnpBx6AeVIjgkgNGBgDw== 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)(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)(979002)(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)(86362001)(6916009)(11346002)(68736007)(16586007)(6116002)(2361001)(2351001)(6486002)(316002)(106356001)(97736004)(105586002)(53416004)(33896004)(76176011)(51416003)(4326008)(386003)(305945005)(107886003)(25786009)(9686003)(7736002)(52396003)(16810700005)(53936002)(2906002)(6512007)(5660300001)(52116002)(478600001)(6506007)(36756003)(85772001)(969003)(989001)(999001)(1009001)(1019001); 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:6IvIowrxGDzO4IWfIU/N1aL8zJX2Al5YW3EyTHlPg?= paPyhQ6gi5AVDh0Hsn81zLDzc8BGQG4OxiMv3VG6NVl+ilgHuhyj9+RI6w7vXyI3LzZ+TmEjsRNkjpPhu1qrMPZ+47UxdP4pCVshstil2/ZL2CXbzvyoziF9yQTAVuQ71S1+5eAA/rbRUCaP4LnJmIXNT5SWHUioX6VfLBbq4rjkdKpy3GEjF3eI+0qEyA2OjrjLIlOVySUWJHc9oghABeYMFV3idQ0RcSOyQMM0mkNT+sAL91ceboPgDcxHx8FwL1p3ZLZAmfyOlcnDzCLjYmSXQuxnkJtqNzrL0e5vMMkpzyeYJnpb9+lpgAzsy78RoKEisdByOXsdOMCYuS+7/yromTDS1JS03WnNgHZ+aQ8e92y/NN8vC0GCT2LFdUWDye9O+f6zhl/u1+Db3ejCsWwsGpg8bOFiNU30dDJ9+KSyg19wyhBzitMJZQsIYjq3Lqjb0hInU8NzgyJYmeqIE860IMUXndKMSXirB3J2N91G8cvrrHVk29bVbyLS268BD4JNtM/9ezbf4TLwFGtHVIE7NASj7f2DFFen/BkXW5oLB7TJYJMLPjbp+3syv/uN7d7cpSo1dGJR7swCAaQxmnZDTrZ7BKWVGefd1Wg8ycS5lK8Bleu7LJgnN/ToeJWCW+cTAAhU9VmUBFzWKtwLu2c7TgODbvXpsrEkLkktNsIvvHtn1HaB+mXQbiu22oagJkcDMgB+8Ok82qRyychFNpLWugGsu8XxAb2dC33BIERSoqdfOVT4KLIGX8A01UBOiXLYHJx8qnX4lMctONHGd5J1RdgUUH1l6nTvkHZ/565w45+cj1k+ZtiAtSdTT59DLkHAthVWAyoVjZxCrF03iDrulgcd2eQaTCeEHwql4WTFZJz4/nJef6x2yCkjZ3MLeb2SByVnKJxOf1V7rQznLDTFsMHY11OKmLIGLHOyUARZena8/Abo5kG8o9nSEHtwgBbJJPGOX4kQTyoJgyTKIouIoWBfX8k6BbLFc+MOmTr23YzenZyFtfz4jPutkNTUsbmheBRLMu7ZenmlhJ5zqeW1WjT8cOqYKb7s+aLCY1r+pngMbJHp38RxE8VhcRLGORoWbvQ91wmUsQ25xjdm+zQDfizPkrA1DJWXVHGyfDAF/vCD1Ei5GCCIPsjOhHXnX+jD1fs03PCRpiV73cU8FLOKWeCtwp9OzRwDsFuXau2NCjQFJiV4CPz+AWp2xWs+mF90g0GhX80jxc4pVMTkYdUlD28278ovvx5l23U19K74FcMfB3Ak7Hjhwrvl9eilcj8PPC/Vh6z3uNpnlMd7vxHaWugSYr6mXcKivlhY2+m1d9ptZkNo8D2HVoRboHMm/khqOjzcrxRK2pEjIwErXm9KXnCif0t17sk8IcUU9MwXher+pkfi6Auc0gtueQnH1YpmFJ06SX2yMKiu6wJj+55 X-Microsoft-Antispam-Message-Info: CPqJSJ0tHw/bFqepe5GG4EUJMGsFfSQfWcJ+eVWftjYDoWEOked+9EJO9lbsxTMQC8PHuoDYhJg6LIkkqZesx+iSfKGLDVtUlD6oByeiVyDa7WLsR3WnDWRZ6cg9QPgJKF/IpGVQa3yrYMMjE+9OKXFeZGpweStu5JRbizFUgvPhv41gA2zkA/ly0qyr5crX X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:rT2gQHtX1YyWCsa/qtQO/8lNtD+RyIZFKE+NyBirp+5WURrqLdv1Nsf1UJgTd/lxI2tlKCYFU2k0j359vdLkuX8KX5SVvnDwBTvDG0MW/ORMLgM87m/aD6Gh7yQxB2PKOcZL496WFtnbWiBl3TQb4nIlQnWQdfO0jojqXIXj4W4pxXRUMkk4DYozT8Q509lyBSsy/9die4ZGG1YCd2YzPmUxBuW8i9seF3XbLxuETnXYvj33D5f+EhasyOrtb9Qj6TzUh682pzMfRuozTX93MhuXPknrJum0b67Kh3ElPpsHi+eIJE8Qo68A6pfctQdxKL7bd48oWpJpeI2eMQ+4AtjAGdurhmEBHIDNDdkEiuevRosCIgQWAByc+L6ulxSZXuoxWhDWfqyqtutr/1BH9ZItR7zkWp2Ux/o8x7e7IvlBgJEN0cfW2mEj53roe81r1ajmweZTvHmYSpYFZJu4Jw==; 5:ZUIA8jsVXrmXVhH3Ymab15fzxOUpeMF3/QHzzfifNYDA7i0bd19NzXx+nrBZyMAzRF6aE9jZumuM/8YgnNfze0ydyDj6lLPQjQbM0VboGf6TjqYUutNv7BWwt+qhdhkvKLMFBnNHqfYaVkK7WkH+R6j3bOt903htC/PHK39R4ng=; 24:v06lLhpeWcN6iMxFuNms4/GTwt1oyBekuojP+D5S1tRhGsriCnr3RgY+zL+61tNbIMLEi2cbMw6y4rYxyEhq/ZHv/ug4zxCdhxGJpobj3XQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:ir+L8VMPjUpML2TyqthYUB6tmtjNAtn+doinkMDeLH7Xsrqsa+xZxDyIXoqokS7rc8RXINA8AbbJv2ImKsRFHKJ1r3wF4FRGh2dh7fJsth2VXqPAlLxDabqMpeJOCtWDfNS5x52jFMIZgIyYiT4wVR9HTZoOuWQNmp44OEZftw8qgsxHK6bs1064zVjl5a6yr5b+RGLr7odDd89Wx+Ae2SHUycxSsbFRHc90zW7rbph21gT4MYLc2jejU630tYDC X-MS-Office365-Filtering-Correlation-Id: 550ee231-1e46-479a-63fb-08d5a05ab59c X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:38.9250 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 550ee231-1e46-479a-63fb-08d5a05ab59c 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_024954_053828_70A213A3 X-CRM114-Status: GOOD ( 12.07 ) 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 [104.47.1.82 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 mesh join function is the last function to be called during mesh join process, but it's been called a bit earlier than it's supposed to be, so that some mesh parameter values such as VHT capabilities not applied correct when mesh join is in process. Moreover current design of mesh join that is called directly after mesh initialization is not suitable for DFS channels to use, since mesh join process should be paused until DFS CAC is done and resumed once it's done. Using setup completion callback is how AP mode is using for DFS channels and mesh can use the same way. The callback will be called by hostapd_setup_interface_complete_sync. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 7 +++++-- wpa_supplicant/mesh.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 88001a1bd..c5b8379cd 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -215,6 +215,7 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, if (!ifmsh) return -ENOMEM; + ifmsh->owner = wpa_s; ifmsh->drv_flags = wpa_s->drv_flags; ifmsh->num_bss = 1; ifmsh->bss = os_calloc(wpa_s->ifmsh->num_bss, @@ -231,6 +232,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, bss->drv_priv = wpa_s->drv_priv; bss->iface = ifmsh; bss->mesh_sta_free_cb = mesh_mpm_free_sta; + bss->setup_complete_cb = wpas_mesh_complete_cb; + bss->setup_complete_cb_ctx = wpa_s; frequency = ssid->frequency; if (frequency != freq->freq && frequency == freq->freq + freq->sec_channel_offset * 20) { @@ -372,8 +375,9 @@ void wpa_supplicant_mesh_add_scan_ie(struct wpa_supplicant *wpa_s, } -void wpas_join_mesh(struct wpa_supplicant *wpa_s) +void wpas_mesh_complete_cb(void *ctx) { + struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)ctx; struct wpa_driver_mesh_join_params *params = wpa_s->mesh_params; struct wpa_ssid *ssid = wpa_s->current_ssid; int ret = 0; @@ -495,7 +499,6 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, goto out; } - wpas_join_mesh(wpa_s); out: return ret; } diff --git a/wpa_supplicant/mesh.h b/wpa_supplicant/mesh.h index 995210236..2e2231b68 100644 --- a/wpa_supplicant/mesh.h +++ b/wpa_supplicant/mesh.h @@ -21,7 +21,7 @@ int wpas_mesh_add_interface(struct wpa_supplicant *wpa_s, char *ifname, int wpas_mesh_peer_remove(struct wpa_supplicant *wpa_s, const u8 *addr); int wpas_mesh_peer_add(struct wpa_supplicant *wpa_s, const u8 *addr, int duration); -void wpas_join_mesh(struct wpa_supplicant *wpa_s); +void wpas_mesh_complete_cb(void *ctx); int wpas_mesh_init_rsn(struct wpa_supplicant *wpa_s); #ifdef CONFIG_MESH From patchwork Thu Apr 12 09:49:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897594 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="Pjm1rLLR"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="fo/+0tKZ"; 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 40MGRh1DnXz9s0x for ; Thu, 12 Apr 2018 19:52:48 +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=CXLk/1+ARuJzFnggvzfy0UGe5Zzp29xUzT1iOSq+kcc=; b=Pjm1rLLRHBIISU l4E64ohhQ+EeuKB7lLfM+4lTRPE4uqDaoUtIKrKRFQ4LlszvQ51vumOXaQbe/C/lWqG2jXBMChjG3 FepRUf8dajJPIt/dQPcVhJV36gGG0s4gkWtk5VbxDpU9thH4xomFx1WNepikSN9irB+o9u9j1TmaC JJpksEnl4+qE6mFNXRlhCa/xINtlYKHURU5WogD34yyuOsGmc/1sIVyoSGBcNb6Umt7amd/FfhPgW YSBO9NgQ0vcIxgwTGj0LfbrGk1ElXOQanZ0bW5ScaTRnqTHjxtK0cQ6AHoC23zIf/FLHct8y2oYm5 YiSQYivtJm/K0VjAVcxQ==; 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 1f6YuJ-0007ng-W5; Thu, 12 Apr 2018 09:52:44 +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 1f6Yro-0004UN-G8 for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:50:11 +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=RzP9vDIVjK6YT3Qna41N3fvFW91cWtYz/lKBrfABUf4=; b=fo/+0tKZW4NPlrMM5+K7I/TM75j1m1ApJaHIYBav/3k4ubtVZcY0xBuFUHCvxBHlwChaURNAnBRbZ50vMIBBpqpSzmHHg7qHG4mb5GP0eWwp51rjXecl99xR+1XBp//spwc6cWbssKgNnHgbbNUleRxnYvgRsX82T/fhkS+KU3I= 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:40 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 05/15] mesh: reflect country setting to mesh configuration Date: Thu, 12 Apr 2018 02:49:02 -0700 Message-Id: <798683f8a24e07478a06de79af400db0c4c985ff.1523526306.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:x8pf1A+ZEZ932HHGjfVNDqvhWwsmvzzkZBYUbkQUXJgy1LTVPKzbeHbe/FCUjsJo6+zk0HIJQwz0llFJ1GbcIc7XGAi2oNYwnS8Iq0Nt7flYsGLVYEYK6kHhZ2Wt5ooIFOTH7IDktaC2zYMxn1euIRvSa4kBqKI+IZZo2jPJPra9XdIcyRdf1WwZwAT2FFoRa70/0Aa+fbiWvAEgfeIZUNhetmfimzg0Vl0qnZ/ngw0uzXW4EmZFV7yQgUJMwbcU; 25:7fh867BHN45RJ2zlqFMBipoGqEMwP/lSm/kRq84W/fWytWaQX0omPXc317jR/XiiZyPbKW1tkUj5KMyb31ykBxHJxIkBREel7pzUc22s0dCFN5KC1iEPh+i6OXKxrOly7H/rDK4Gm3KHGo82FfTi5MLBH2hLmNwLM0Y9vxcm5OSCpBddwRXpFO52ZjkZgA9ig2mvcWHRLWbV7nAuVlO15FjUaBzF3yoLJ+x27IIibuw1TUlFORQ34fDz41YGmdpZPWjcGHj8i9apOssQYvc71u9424oCNJypNB2E4CX8TDSu0t4SDGNXCUD1RHnfuv8F/OBlvHG2W+HlD5+fHxZzTw==; 31:D15nTdhyRNXTLk/xuuj1BFSSHDdIPuYZIsOsVJI3tpzBlsXGfUBZ/NQ2pmqyqeb4W7CADKuD5cyeh4L4nVygaHwRZxmcUS5OdkMqRM6oxIwJ8JjpeWlJiDSsg8oplgTKxAQ3qMLK/OUrlioTglo5BLLlfxiCWSz6sw3yrHFNNHE/TGJhTaE+1chBOzQrYjhcP9S8G3GOdobjsAZSYoQSTXI5C0HgdFe++cTXGVK0qwg= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:66iPIa5yeJzf4BeDGNgs9GVrs5ke6CIlTzWKAjfy/DeJPq4qC+EXpDnxZmrE7GYynLAn0XRj0Y37OTyPhnN4zXa2v89ujgoeNaypVQGFi6qednbdGnIq1XEqvk7ERxJQ4HpyWGk4Ect0x0LGgdLOoBrJnHvGLsarHVXgUpT2eJCjkmf1QLLegAKqH4neT3rn5WDt54tOwS/utBCgFRD4z4Ep4/xkl/MUIVW4W+5OIq3xgz/TG0plJIrMUmUFK92Rcex0ijo6K6HCPS4kTt2IcYv6vzvpcIpdDjk0M+RjiHV9B/or0uJQOQxdw+euiZBHY0jbOtDQewEiiHy4/LIVdw==; 4:eR78Y9HXKBI/AvaDOe1zGnFbW0QHdzXRuJx9J5xWQD1WE2ZeumjV/aKbd/eaaRS5jLnyknobTGRwb8LZv7utPhJxviWvPKsTYyWq8oYzYd9236rEic6ikF3e0osC/dXaUbWiTLKrMdQ35kKHUbpEI4SknzdkqA8dF6ecgoMdAqhRtQRZ8qJwulgjtP7gacP0x9U0zBKbA1OPsJe0gGo0s8TTETkIKVGouGSimM5iV76dL5iuhtQYXgsqAW9D4qmvl2pa3BO5mVxWZRacGrbWWw== 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)(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)(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)(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:PeC5h+dNIyEMvHkGA8PLe3Cw6giv8sOUGg0HGkTLn?= OTO3IoTsXg6OXMVw6xG+hwsGWw4hZ9tmJ3glOm5kg5or/ed2igpkoxKCnpdQ4UeLG/9JWUfCYwbVmfkHflNI2U9IT0bqaFQJ3e8P5yMh1HL1ThHMfYrVaGOdKJn0BAVD3vzIrJ9+wBSnvTV5mlqUN72Sc+JJIvk64c3hFwSgefwp58XYDwsCIm4jU1cAl6qJ2i29BCE5orKH/N3lhdUCq/PS19P7Mu5NSxFJpcY0EBSnhso5EYLis+jkfcERd2S0vOvBc8SsfnaSh7DwAiwPKfoARaqKV2jcaIoJz8onRFZxtWCWPoly5I1EVWF2rAlKvghhjC7KAbQT8gm0QdGoitytOvnaSa4A/sAWalAaRLA88WMBCKRo4E0bp4Rmlmc4SBtO1uIKr76j4G78IsqjZHmC1SIqGZgsg2AcldJmQPFl7dA4Rz+TH+RJm0aA4o/k0pb72tuk3FzL8aCxmA0U8p/Khs2yhPeomtM3OVuiAfMuTukYzp0n5w8JzP5dR9Khu3VFF4D/AdG0AseABbkhFwvmiJsKYyV0N1XCFCTF/KP0pR+hm3I70P9zeemfq9NDgvibAY45kyl5maI0Dm27wdWc7ACTZExWuXHICKKOxrPn2sBgGv9JFNABvyiu16r2NT4lo9l6YtuMEtiJvndXUeXLyyhXyGGUgBg8XlpmxgAJui+clNM4cWKVrqB+wRxLjrKGNvcjhQwi2UGr0bTsvsov+0yzipf9RMdyoc2QtMKwb8nop50XoZt+MB+RP3CsDMrMypb8cyynwbsSCWynxPmo/2G/n0r8DkRz+zSd5CBAhNLJrno8SJjQKsEQHEgDo6eP+sruIYxL80M30n7AYsId4gFLH2s6ueXU004XbuZcSJ5vcmmpEapwXVuOiuYe19ER9ZaUQ0uIXHx1+HFyiPOn8newZdw0LVadASDnH1p72HH8gDAmh9m+9Ff55F8n3yLyqtlKNVB8wHzdkZ4cQT41tI8HXJap/K90fKJUKDgn7MMC7IYQzuo1czwbuZeP4vkdSvKdszJ5OAICGvpi7RnHtpzNXlxTdGot5JChB4VjHAum1FHpwlfmlGuuZVcu4GHfQh+61HrHmmqzs9oqtfAhoSSM+iFQRClOqsyJyd9jL4QDQv7rCKPBq/LQgeuriuLOg4rV20C/NIchG/JpEqZAwPETK+zQ3WQRza+W8tdGw2SthH9ols67dKbP8PDgUFXX25ItDQpCdMSYa2zr2VvPNkGVS6GRuKlgT58fuRSbLaigsorF+Bh7mq9mvbqqihPU3WGUjCOpyDQc2D4ObN/pPba802prgIBlSQ5UZRWl47E555oLVg4PY6xSbLLW3dai9/YdFGo7kj/CePrzlMy X-Microsoft-Antispam-Message-Info: 7MzfOp19144gikmx4rTjeWM7qiSxqFlUQHqbrmgGqgZBkg1sdhJisYkJz2MGlVVkUbxRvT3AqvGJW6kGmKyRD2MwUt4Emdn8YFFJPIIShJUZllF19MVzzAfgAkWNWjhu3zc5oxBILpcwxmbx1G2EFeQpX3K4kEtwCOmUwHQiXfnau8m7+P66MdER1Hk8DyjM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:D38SKeg7Ts2ajToMJT4LqSRGDiLqHRWDcsPzS4Xk2gzAyB9yGwMby4X4c29U9SEdhQG3h73n60HQbRJyWW8bOyfGX+LMugvwZDfK4rkZ6AnEczI5nME0hQrMxC1C89x+OkJ4L2ZzsnihCbWzNwghNPl64mTYsYkCzJT+a3F+bf6jgWBoUVJ15niEgXimwpPgPTCE0T1rjurRh9iXdTvCsNbfI+dbCfARvl4Tsqo8wwcv015rK0K01cLEK4sP9G/ThowbbLzExI/tbjWomYumoM5JWyL61t6gf+ZYTz6QHRut8f2eOr0rjqwrXDIgHL4Q/QfQtuc6EzIjBLOXBOT6cEtomBcnjSvPFWy9wJf8wei5+v7obsl84k28Y5hJOyLCBWWUSMzGGwrRj/o4xPfjItB87hxc8lBOctaC6IP9UIIgI2ErS09ssM0Z5Jyl/55X6Rp0Zg2xQ8N+F7VLM8jKsg==; 5:EBv2WiIQcuCJUtDivsxikjhXQqBMTIDlDnxeSzXW4lJI45vrRuYulhTWeFTSJd/C8M5VHUOgbMeDwqSLihK2NmApdiymTjDT1QSC5wm8TtlN1ghJWZvvpZOa1PJaYfKcmwOaeHLs+ipgpIcZ7UHTtEpKvGXyO4Q+W0qIqCwLO5Q=; 24:wAv0eo6Y3f5D2SRFEG2k+H8t5GVO97UOJkYmA70wObYrkeR3gLkmd/ltJ6NAVE4diZvItA1oulRl7CnbkyHps5+9zIl545DvMJ1duhQ9hNU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:Vj1kg4AOjVCG1Bd5uyS362wpMeuU8GXqR0fdYtsrFD0uvCDpH0mcTsqzqjBJp1CEM/gEix2IXS6yik3md9MqdtAFB/V5rdJpTHzihj5TtX3BVpNdnB1JfPbXTkDkK+RdJHVl0l0v47dWvX4gw5eRLjWPAefiGyhwAtwcITnRU5bd6Fl5gwvQgIjKO9gnVAp/AuI9poYUAqt2BU76E/zW4/0sd3iij4x5qMrATKCgr6e/lVd3t1OEP/K8i2pIYxMr X-MS-Office365-Filtering-Correlation-Id: 56480cdc-3de8-4bf7-2348-08d5a05ab65b X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:40.1750 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 56480cdc-3de8-4bf7-2348-08d5a05ab65b 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_025008_769176_906DBB9E X-CRM114-Status: UNSURE ( 9.23 ) 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 [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: 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 wpa_supplicant configuration has country parameter that is supposed to be used in AP mode to indicate supporting 802.11h and 802.11d. Reflect this configuration to Mesh also since Mesh is required to support 802.11h and 802.11d to use DFS channels. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index c5b8379cd..aa710c69f 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -252,6 +252,14 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, bss->conf->start_disabled = 1; bss->conf->mesh = MESH_ENABLED; bss->conf->ap_max_inactivity = wpa_s->conf->mesh_max_inactivity; + + if (ieee80211_is_dfs(ssid->frequency) && wpa_s->conf->country[0]) { + conf->ieee80211h = 1; + conf->ieee80211d = 1; + conf->country[0] = wpa_s->conf->country[0]; + conf->country[1] = wpa_s->conf->country[1]; + } + bss->iconf = conf; ifmsh->conf = conf; From patchwork Thu Apr 12 09:49:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897586 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="FCKCSUz1"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="iKkHGL7R"; 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 40MGPb3w2Gz9s1R for ; Thu, 12 Apr 2018 19:50:59 +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=lcOsqU6RQXRgQN8wcur1m5qT05I73O+IiPk+IhEkbjw=; b=FCKCSUz1zMG2b8 LsvUmfPdP0zrYX40R4RVRVwosIHk7psbyAs+iuIOro92ApwMnSVgnNJytuzBiUJeGMlazM8wpqp0R vmqHPmY3YcVstqye7pN0kBng0aumco+HEz5LFX0UIpR3OH9XexuR7A7zU9o7PbmefaNT7S9Slxk9l rz8UMECEKLgOEtoqF0iEd5jh2KWBLMAmWKIARlGOA5Y8osxTKLD70zjBAWwfDsQ8kv6qQVijA57YE WNBc+BFx2WHleheZGFZKkVSGZyTaMEGqbrNpnBPNO2Th2TTSWqq2Cdo0ncwUVHQD26oxt5/A0zgES Yi4Z3yo42U53SBz2lf2Q==; 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 1f6YsY-0006HJ-Aq; Thu, 12 Apr 2018 09:50:54 +0000 Received: from mail-ve1eur01on0082.outbound.protection.outlook.com ([104.47.1.82] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6Yrb-0004Or-VJ for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:49:57 +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=ugOIhnj9pxsdUeRwWFhemhzGgwgrJslSeINoDa+BHuI=; b=iKkHGL7RGohv5kJ/IhPjfgt970w6/Lf/31uN3DcNgu4DWnCoOnxz9b2UgnwUi0sjk4rVqR08Fnf8Yav378SOdER4JruQhaqUTJwEycIRJhQTKgbeGNYHqWbNT0WrwEpyXKHEPxVRCzGDuP92W0TFS3vWpLJ2yCAIqZlTLLYWAOA= 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:41 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 06/15] mesh: inform kernel driver DFS handler in userspace Date: Thu, 12 Apr 2018 02:49:03 -0700 Message-Id: <3751f615dfde248e7d250c4478fbd6cd82f7a4cf.1523526306.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:1Wjtvfj7xwLPib2KmfgJqJmlyKj6bwJzr1FCebtHx3pg7VigYXL4L7tn0JbBtawzhiyBwOfnNssDjXp+oZNDTNNtIYOLhKUbw+DEYHjkY8UsKa3KD/5jKLRwUV9MEJlOrLTyaAX89SlDfOi7UxGpnLHbP/jJCbamTKeNSkgzTI38s1h913qUcTOpRMa0r8Hv9zRRs/9v3rnGUJbodsjLDpHFGBcsKvYZtkb/22lHQYBRH1/I95qgbHYeCtwxim4C; 25:7o/q39WHUJDWgS3IEfYyfKuOtyGFWAxQr6BjAw603r2SPmcJ144rmtprAHUpXPvoECDCYs06Gei6uigPgHr5IwmP1N4S6WJc9BDfJhDaJrgD/cNnroS90/n3emCYm3MUcLDPd/LcSg1ljRla4IPHw0iN14nk0GMIWN5HcUxpyEKcLE4DVIY+0JEYkg7lBQrQAj+G+D6ghN0IkenzDy0UgvSfQ10IJAouEiVD+GH4/D5UNezpd5+N+c1FrJ9yUVugaGPpJgFcp1w4rqZzsjOlplMb7yosGdx8iukashIPjUR4ieMVE5FMhU3Tvp4jazzgQ2IPP899tV62COAQvb7XZw==; 31:UIFu7zAcPwvwc5RD5uk6DN2zY+pe+F4LZ6eBLHrZFazbrYhznJANc9UsOHqS1lzqA6dB2VAXF0ft6pPIiEQg9o7u+lg/9KxS409pkoHl+OqSCsxk8CWJNKzEr3ua6YxNEnnqn1js9wMXUZH5IoBrDxrrzEgswRF590732O6UbjbxWDDsoaRYqAfLJVaXS6CZmrwfHqnX4Io77aYEfy6isJVVQN4f6tZgAkcf8l2wONI= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:XPTr9p6WGuXp4UErBn03FuqCa+FaQFzdQUgJig+WBviTDEQveVbioTZtLED37bpkMD293M6JWGzMKnJNCeZGZ/6/shPSHF0RdZXljYQKn9dhX5EeRHTAT3Yz+SZrhnigtfT07DppFcSolI9Yjx1V8EQt1bHG+WMB6OGt+bskLlb0HUxnOfVEAA0QjmzOVfr9IM7nQmwxhHtKQB/D5NYd7OnphVW/xl045bpHSAkzQekuhimmbDdz3H59ILNBJq3HIlOth5nh+wwy21Jc1yyd1wXfQmJzgknUfOKPY9U1zHHCZTAazi/hYvGXYwsH8PfQweYPGNoYTksZB7YsjS5i/A==; 4:/tTGQE/WWJIuXW4X4drQ356t157qX0FudXVx4MIolEHobLO5nH70Ccf7y1wVKv7qxfAs4N1NLJml4JFRhvvNczowuLAwoVhuwTA9EhFoZOcVFRYKTy/c8F9qOi7CqS1LWYH+1Q3g8cHYBtRYnzoYn1OjqeJpvF5uBuoAjLoEZPs6SkQ3XYwl1SYVXxrtZBYkwjp81gNfaaPGYaI3DJW8wIf8jZuUPovlHrRMII69GcqZ3c3BDPE3Kfv0nuRlQf7jbQS64NKZXeRKqaal8nfJcg== 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)(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)(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)(86362001)(6916009)(11346002)(68736007)(16586007)(6116002)(2361001)(2351001)(6486002)(316002)(106356001)(97736004)(105586002)(53416004)(33896004)(76176011)(51416003)(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:V57P+75WRl6o7jfrfwXoSPtz6vz8QSdHxlVqUgzJM?= nhdlgoykuXqZHaHWwKenzjEcw5a7RiqpquteabSILxk8sTnWJGHSIR0zmpMMbp6jPZ+z19SoXkYHTQDOMxWxywNy5LrQ/VQESjOZmGGliNg2DpAoei0E8JZHdnfYjML2f4we/so7d39S1xBNn05mT4iUP3lBlyl1AFwmLljNeW8MOTSXZRAxlvNmmvPcAABtNU/7zvGxRlS5YSFj0dWCFu9YTbxiSHbKlvfcAU9Cc0GKQorHJG3pQg5zKf/KBEvodUhhgzVsghkA7aWhcg7C4JKXJTE/AgppqZB51LaI36utQeaUc7Kf27rSjg6LNdrl4zey+00XvWStxA2oriAC2STLetEeiwJKz4D1G88rCdTe7em1DaV/wuDydOAl/S4Ma8mH9UhDj0i4TgsyuzzCz7KDV0nuRAP6BqtjbDutpS6pF7MfA6gBlXusnXRO8etWIu2SgXcwaJX9Zi+IT+jorumC7JU1ktid9IaKqvWUAfOAq9KXNiewbEvdRcdeTBsxqM3krZKLTK1CXBkoSDVjzLKkzCHCBE1oEoJCqLVByzMZGCmKcW0PCirtzCFPoJfTaBkUDpXwUmHqkA7cYp6+ZI58ZeXgiri4QVw8iZMPtFECgk+Juz8yQjL9MVYi6gbkzs6gSQIkNJCjkuY3BVm8lRisW+MQP9kW6fcwKUs2vFffHcK5oIb2KjrSPup3qucwD8YKQJnwh8bEfswlqaCCZVx6EutR3altXqjKD9WIqOcV5k0pGaEX/4cJyFLLYLWrY5ABNifPZQ7G1Z8IVyTmCTuUcUP9RrGYUFYIIwi/nygax6hF6+pcAHkbyyVgCk/eDt7N5JDfK3xmsRaF9+Iv5yB/HpwdRoixWaDS6IlzdrSeLq8uEkiWWhIb83tKIOGnzP6RhxDqS9UsdjTTaqZkH+8ftm3US4qtQnFSbHho8nA1QLFie42TP+EbP8mbQ2NyEVtlH1FXLHSEZt63iQq15ftUb8j+0S1AQUHYAK6I+ZqYxGcE0sPkkcr0zfKiHZL6q+ZmlQRIEUOW76JTE9C001kMKwccQBF2v/RM3Z4NyNfFgQgKzBeNXEJB9faYISyJRTWECeoVhW82BElwGSyW+mEz7AO0kFJGCCrZ8KRH3MVUyDG9qlR6IZBvoL9KwF/Ls5XXXyTxDTj5rkFjMGMnpErkZKWsECElE9ZqJ623l6MmWrqxdfxbwgjWxTbjtrkCObN9Z4X7r1njYIjGtWH4a8nvQdSOjIxw0EAF5reuJS3AyC1q7wHiG3fD7vrtkPZGxGVB7BLgyMR6KO10Wprwum7HWg6Hgje1P+etPjq5IMVVIwZy/1YXqAlamE5rBZYjyk= X-Microsoft-Antispam-Message-Info: la9EeUkNhC0KZ9gUbdYIXqgu7Bb3avSUDexFbYz6HRGScR/c2HBJ87XgyZzGNjCJ/4yhdcwA4jlffLtPJyvUwIlat2mC9ePpwaQSyi1fd1bGjrzMUwLbm77G0Z7O+WC2dxvdOIhG/+cryoXKuvKXMRdntLfgiFWqlJ67s/0W7NuWEiaR4FgZwsCfjJg/BLie X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:91KrqSyV4UBrSsGgP1T6G/JQbvJ4ldO+hPvGRTsCWG/hcyh7FQuxcpH1Gyj5X+f4sstm1febvpSdHylbNowwNsWkN9SPYpN3c46x3XJg2ImtcmkpcnPu26IJuRXVQ46+/sbNptJylVQ0lFS62R0bSMRYRJ+DZafAAZ8AEA2CT7rJw9JTQ9e+DsFOLhH1JLWJXWnzqfr3dnura9vuAhumWh2hmDc38qoomlQBq0MUv13CclI8CrlPwrjIgsUcIQ7J13V+wSq11c/dY9CS8uYg4EK1nUGB0pi9Ps7ArBgf3alw7qEeWetmuSGFBIGqDMpiTXzZ5ZsUH9/m3EsIJS/U2yu7tHNHhuJqpac9z+ZNYBeltU/OqFZjKf+L+bVHAzqE5xoTCDYA2U+zPRbCSRqWZIgS08oZxZQFAiZzEkAMvaoVDXrFg/Cu+j+sJzGDQWdkHQEjM1lKtssKrnZvofIe+A==; 5:P8J/bLlg0Ahk15Q8eCNr35MclR4mvDkeF+BvvcnCG/vSCk6+T81nYGqcF1Ttjlk6Ph0gGnCoOINt3ihN0o7nCzvze1LyUU1RLdZN8VJozmYugEChVuDtEG5bRI6J3K5G2JdosHmOL1AAz7jLjpE2/bABq8ykMuaAdbcHiXuEqtE=; 24:KPr21dwJv1G+NJlZdqrqkm6b2ZBpuGXsibi4C0SM5WN68++mh42T8Jp41+kME1ZAomgVI8QxPWa9keRIupj2nepgzvC4rnZc9RiIFqy4ajE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:HjpSsBKsOnA+XH1dArxlmSuDemFIMNeATrmijU4x9vPh8jWckgL0QxNNSl7kinR/EuNidOuKlC9c1AIKHmmV8NCQ1qbhRDGJvOXX1RbV7Ra7CvVpIANwRVl7bLHnOUv429fpJyFLiRT+m9uvy1EJHrQfY2DynnUUaCbhawlF1sQQTJy23uHjo+0VjtpniBFPAGAwGSt4DKP+lkIGsQTgpxAfxY+RzMMJkaYEvkOeacEw5z95GzNCEQtKhgYe4o5k X-MS-Office365-Filtering-Correlation-Id: 32b97067-c266-4f67-f5ab-08d5a05ab72c X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:41.5501 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 32b97067-c266-4f67-f5ab-08d5a05ab72c 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_024956_055665_E01C86DD X-CRM114-Status: UNSURE ( 9.93 ) 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 [104.47.1.82 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 NL80211_ATTR_HANDLE_DFS is required by kerenel space to enable DFS channels that indicates DFS handler resides in userspace. Signed-off-by: Peter Oh --- src/drivers/driver.h | 1 + src/drivers/driver_nl80211.c | 3 +++ wpa_supplicant/mesh.c | 1 + 3 files changed, 5 insertions(+) diff --git a/src/drivers/driver.h b/src/drivers/driver.h index d7aeef99c..6c9245584 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -1390,6 +1390,7 @@ struct wpa_driver_mesh_join_params { #define WPA_DRIVER_MESH_FLAG_SAE_AUTH 0x00000004 #define WPA_DRIVER_MESH_FLAG_AMPE 0x00000008 unsigned int flags; + u8 handle_dfs; }; /** diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index ac06d20fc..d5aa3faf1 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -9244,6 +9244,9 @@ static int nl80211_join_mesh(struct i802_bss *bss, wpa_printf(MSG_DEBUG, " * flags=%08X", params->flags); + if (params->handle_dfs) + if (nla_put_flag(msg, NL80211_ATTR_HANDLE_DFS)) + goto fail; container = nla_nest_start(msg, NL80211_ATTR_MESH_SETUP); if (!container) goto fail; diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index aa710c69f..e5799b4f7 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -258,6 +258,7 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, conf->ieee80211d = 1; conf->country[0] = wpa_s->conf->country[0]; conf->country[1] = wpa_s->conf->country[1]; + wpa_s->mesh_params->handle_dfs = 1; } bss->iconf = conf; From patchwork Thu Apr 12 09:49:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897587 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="rWRzGxlE"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="h8svpYML"; 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 40MGPt0Hjyz9s1R for ; Thu, 12 Apr 2018 19:51:14 +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=B/25D8Piu3S1YleG0gaMDZiagmiwfzFSs+DxGH82E0s=; b=rWRzGxlEox7zxq W6ijZzEEe9WIJCXZA1Ob2WLajlwoFL5NBBX99L7oP5WPkzXg1bHMD1kcF0oGi4jMrSmurVsQ4X2Zy odPeJBvwkfrinJy+ePc529Z9gn63UPaGz8+EL17yj4HBJa51MBdm5YXu27f+iVpzqSNCeKrF4RhLH 0tO/lBvLO6TiA1eikpqSXly/dBHYQ0GlKsEoQuykKO/Ygv11jHQippn34qM0v8HCiEXJiK9YeUqg8 DTvge74UFGZpoqxWz/e0PqowB8Y7C7BK8hJ/hb7l0vgm28J91fgflw754kW6LKFDHdVseCKlkg3Kn oUS6zYN0yP6rfYIMPg4w==; 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 1f6Yso-0006TT-GV; Thu, 12 Apr 2018 09:51:10 +0000 Received: from mail-ve1eur01on0082.outbound.protection.outlook.com ([104.47.1.82] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6Yre-0004Or-1J for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:49:59 +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=+DghS7CfZWvWjd7E5bHOE0jj4BqJyZ4Ppny1szqcZA0=; b=h8svpYMLRw2q2R9eadC/6W3i9AfyJHUVpiAD1DVxAR7WtuyOQygV97J3D76+3QRCAu2Gf8h95w85BeDeoTNkx2Bdr7JlLihM8Jr7RVsU74PdpMfR0nIVkhgj6PJ6+6hsHuDn+3TPCStW49vhGwSkL6v1U0g/6ijp66sHviRoR9c= 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:42 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 07/15] mesh: apply channel attributes before running Mesh Date: Thu, 12 Apr 2018 02:49:04 -0700 Message-Id: <64a0d7fb626e46dc2c8772607472952993ccfc7d.1523526306.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:4AAp54iuqOrkf5vZISPNplr81aFE6etB+dAqBimjjjC4Gt3zaGNdxgmYNo2ca9U7kZ467NDtjGEYAptOMz+YC64kqs2fjNHrUZnJkVUmY74MW/+8bYwCJh3LkTiwQFZNaKA6f2S3qzoQ825IpPt5+La+nFZ78sLA47aRMbPLBtaZ1J53YI17mqfQoI5umG1+OBHXjWqVwTEowHD9QetQ4SLMiLa/QgQXnjwjEN/cPepwI+kb0RszQD/uaKmGrg52; 25:MXC9zGh4XvcUI0LDKwUYEUhMIH0H6qe2R7P2e+j2d4ohJER251FL46drlWWohFrnpHUwqbdR1b+UMRFcKym3It3QYCcGz3UPZKKgn7OIydZB6l5mqQPebac2deTxZcsV75s9x4EIIRMmyQlLagjmb8UZYkUKjKc8WLjsC2hF0giAauNVU1QYi9oKqrg8GEyX5g7x290++DR879wAbMlAIPdgirgOyAQSNL0dcMs9xih8g4PVsngthuOOI7K+M5wKjIooqOzpldgdu118TTo4QM7Vy2QUmRWycqpm1fc/uR+CL86n3744ZDd4aO+vdkEEWeuqLBkyQNj0BQDsjBmRGw==; 31:edbpaYc0Zw4nNiVyfd2rDG1DpboZsq/I+E/prqMXvBDix2qEONm3jFYFEIWO2xVrm+j2MXiLT2BFuijVD0bNmnjH8Gf22fPdSeZTtUad8uwoOJJNKUM6C8DeSwDbi/Cdd6ADNgLjY5Et79jtnjJuDpA7Vn+86FulOPXwMDvQL3fkbNhbbGti8TFd+phznpWSkvB1fldVKRuT4Lf4D+sh5i8wn5qFyLO7zKc4D2CvSCI= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:be4HzfL0egVb18Q3/kjf8c3BjTJNhk7ylQK7PehFxl8KuXFsp8xDHyPqaxGG/jX8k2JLb8HjGAoVBmjb/HZAVV8krGrwn3TxegRrhGWsaVDZ4l5cYRyaJsc1zY/JWrvM5yTg4k4pPA4Ft3lTTsfPYLk68a3RiRZY812xyKabdxPF0ahaPI77C20R+jvyV+0hIry+MeLxrlVniItu3EczKMUKQSHm23/UMPxqAE6usnzkG2zFdb1egW+Tc6tBwIraRwOCzQxb2wFyagqZbpFyc/gUPd5GSWp8pVSR0ykvyn0cVqPpAiyq62DR0wmSI/dSLCf4ejiOgxQ+PMjp5HGzOw==; 4:z9oClBzdrsuJsqQKVBAkBUbsiSNUYXqp/hQri8Lvwi0lOX1A4IwLSdBxMNSk0k2uY/FBwC4o5rtNCU9dzq1k27hButzuRqo8bjmYw6Tot3xLJQLU4U4pkImeqff5l2wseOTGFqWjSCXARxU2lRDkBVL3T9A4PNY6SnbefIzWj1m/2iFSmqHmz7FBL889h2Na7FdsDouA2o8BwMSUwZSpr5DJwFnMvNbWf7lDUYUNCg4zsFsFu9eMvY+ZElL9i7glBg1mVc8vXlWYsL5z4j0VOA== 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)(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)(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)(86362001)(6916009)(11346002)(68736007)(16586007)(6116002)(2361001)(2351001)(6486002)(316002)(106356001)(97736004)(105586002)(53416004)(33896004)(76176011)(51416003)(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:X7Rk3FVllCt0NU23Wh0Ry6QbfLCTvI9sswfeizYIn?= 1CdIzoN/3g21/b6VfT9Qi2mIx+QLfdjBOoItrj9gIgaLMVl1tJG8+cq9riNm6C1EjRcRGqWES/7131BY4jhXyGp6Avu0eUQmDjkZEYAIKnhQ/bn67Uz+GoEbEIkTPQ7O5O4KqfUFgaHoTT6NrPkQlsNSv8z01qJZZ9dN4FQ42q3APVoKc7OCiDt7Qmj5nMHBfzk5m7KO8y6uR/rOpFxYvMQDdJn46L6i+kFOTorZLoUFdVbhAVXb5AMq4Y4c/BBkiiyPThMDU+uY8SU6mJsWc/ydrSTMUqLB5uLRyCCkWDss6bU1eMGfgR9oauE4xkfeTAUjxMbtCCvOprO+o7MYnVtQmTi8jWeogHQkk1h5DuXMLCjCWSb2xNusn4JJwH8ZNg6fvAIExD298vrHQiGhyR+FYqV53mIvD3LZBi5lupYIY54oQEBsdzeVrZ01dZ218nFGlQgB4Ayq8homjCySsPNDm3xZs1Ni9XP1bCsNEHoq7PsndZzX+whVCvz5BSh723KmLmBnlWIGQphrA6dwVN5jxbqeMzwTzNxBjw8X1/WWOu9jYLfKZjgHZWRhic99UC/WJ1xU+3usp26NEjpNLUaFQ3lGWTS/YTlOS+cJZ7D2w69DK1x5u7A7C1rUlWKEuOc8T5UA6JXGLYV19qHt090zjhPFKyCkjZuM9wvcctc0MWh1n9KvHyAdqYt7vKxHZC8tnCetAdt2ETfWTaauOalPaysOSCbTo3fWbL9CAzz19CoGw80AipeG8l7ZG5ZdyaPZcip2qxaWP8F7oYeZOHCeGepkr9YhSYS+ItnqV0wRutWH2B1/7mYN8DcjBbxHflM7r/ynPoyvwIKcoz3N0ARgUVRfAMBu55ACMRXylrINPxviyZrinknx+f+758BAn5fK713Y8gXf0/ydX06XE/toNJftxe/72Zt5kNQloUa35qSetwQL8PPTJLiXna0hlbLjPhsREoEqwglYhdz6vdWY/xIi90HPLBgGzxOHp+zW+gZijQ2dR8NEwGB5bj3TJv32caBF024FT/SrcyNQzstu6t9kGKzz2AEU2Nb8Xf/Crq0OGB9TM4dNjpna5fl6Tr/5Qrs6Ur8hp0MY7mjRTZwu08GsC6zBWkbZKL1GeTKV/WHSivfaqZ0tTtBmf+cIqxgSdav27I8P7TEue0JUUyx4yHthARfOrZGHkCZ8Hm+WjkerlFJ+exwobpGxvp8DGxDv9R29hzH79h/SHPm7iHwdoVgqcFgJxLWcFT4hoyVddmqqe2qsglkUHe/s3xuFa4Vdp/y4+RUYXn8efxGYrf581Jb8bHfTt7Dmg3rLUo6bhYi5hHhKzbYkSRCZhEQEe4= X-Microsoft-Antispam-Message-Info: Cg8ClSodZeBW5Cv/TiFBz5pws4QJ38+8UUkAnlDp/I/mlyegG38ApW4kTCnwNvOxDmoD6domDOasnLjr8T6H+xHMuMVL1KaT0r2gfvB2Xtgfp3Qo0Y0ioexTuaIjcBPnrgEfJ5Yvn+QNBlLuxWVynSJNt/YuEC4pURB0ffOLotw/GaMSWk1zvFnYp6Hvc/S0 X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:NBlWj/JaUZ5f48PMQ0ZhFMSG7wa8SoaPJ02Y4igaVRJawem6b+sMfnOuz6RC7fgAKMV2l6uQNwr9HPSbBdGX/dqy/wQG+IJ/gMCIf0dygCzA4DvSns3WYQ6LoKMUhOX7PXV7M5Dhib9U7M/V/eGnIIBAPesfN8ZuLiDQrzDPr8UkiAUb14J8IRLCAZvZE3TaeaR0sk39SMUPpGY1w4k5IDlqnLpoP0VkO/goZ0Bu6mVxzsrG/sibySL0ZV9jpWpje7XXc5c6yHRQwCEUUqddOknDlwhahDv1I7GKQSp5ssyv17JRCfzy8ciLzju0AHl8/MSatrIb8wQkXyrUVAfwTIEW13DUjGcT+8NFzwVM7+eoPjwCr5AMu8q6mcHwObjIVdjfjtX7nry8Ro7gdFTan4S87kjL/1qRTqqplcpAlmJiMS541uRsPPQI5xMAH9F3V8ixy9qGK8ilT99TdFgkdQ==; 5:NkXfdSfM0NwFnEv7KMkzLs79AlNsjb/Ghea110z/Rn0vNQ36tnTaq58+NowDIbqdLpFKeIh4PUcQP2qrOS22v5f1P8RXQ9lp1na5QmXUNnFQ503dIDqzOa8URRK6fBjx9w4/ZSFxiLg4VD0rPdagO0SSEC6isPaT26fkeFur1Fw=; 24:s4T1HWhhcCvDRUVH89ETrzUArGXho1XxCxsHC26rnObl0ySaVLhA+TnsGQBgXDw1UR9CMzq2KRygrEyvKJwkudogfDIyyO5L/IcqCrsD820= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:IB36zjS6ueFbptpDkc3blej7X9W8ItPlbelJRVF7YJFnsb+OCP5aPvxu+XFAbASj9oWLL0qjbIOv6PN7DENldZzh/f8z6mNFJoa7NR1TC4E5TqxVPx6tG3NOKG0/bd8nKtts0s1ZaRmwfTUJ8QJ/YGxfMKbvCE+nfoI5B0TYIRRyNdMThfPR989n2dc1L5YD///CpSgrL8vCBIFPX7VCX1iLMHJSuQBo6/Z2XGjlDo8eTV8nG5Laa8U9kIIN/52M X-MS-Office365-Filtering-Correlation-Id: c153dded-4a22-42fd-b4f8-08d5a05ab7eb X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:42.8002 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c153dded-4a22-42fd-b4f8-08d5a05ab7eb 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_024958_115737_3611B5AA X-CRM114-Status: UNSURE ( 9.47 ) 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 [104.47.1.82 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 This helps mesh interface initializes with correct channel parameters. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index e5799b4f7..fbed375cc 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -334,6 +334,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, conf->basic_rates[rate_len] = -1; } + wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); + if (hostapd_setup_interface(ifmsh)) { wpa_printf(MSG_ERROR, "Failed to initialize hostapd interface for mesh"); @@ -345,8 +347,6 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, return -1; } - wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); - return 0; out_free: wpa_supplicant_mesh_deinit(wpa_s); From patchwork Thu Apr 12 09:49:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897589 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="S/rIdy0i"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="Cs4Ccgvv"; 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 40MGQM0MhGz9s1R for ; Thu, 12 Apr 2018 19:51:38 +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=ZUmOk0m0dH2oLX2+yPKbHnmREN2EzXH3EbjD1RNgUQY=; b=S/rIdy0iUuPrDN i9PHF/GyhaGcdJ9yXdEaKw4wH0abctnzJozsU2Ct8Rm0sAPu645Zm2MRicuNnw8cpVHLCa0s92VtQ i8Qd6D4WJUdS43EdpORjwbs230mCntHCzLxDtc8aNofImo0zqKodElUgmxc/3xKpOsyXhWkXIxs8p bSNLhOMLds9Y8if6Eesp1sYs/sU/VAAacWgkw9HvQvmRw9AZKRP3ceFAvEfRVzhViVaW9xflJD2wI bBClSMlM49Xj2ySBB8xJqlfnD4Yz/kG2au96n/kQ9Wr9/fX2EHrDYpMaoPoLnAhMbeg0tcbuM7UO8 Qu2DQqbOZidZb7DoPtnw==; 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 1f6YtC-0006lZ-Rm; Thu, 12 Apr 2018 09:51:34 +0000 Received: from mail-ve1eur01on0047.outbound.protection.outlook.com ([104.47.1.47] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6Yrf-0004Qg-Nm for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:50:01 +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=1Z1mtEDOo0cKhNqqkRpQ7b11hg4aFmt3xYGxcqhngVo=; b=Cs4CcgvvhVVLX24qKRLI6Hm4kkPLxKHed2lI1MtXim3xKtqkmlI0Rfldtdot3Y/CkHgOcN4xGOojfoK90DthheS6K5mKbdZcthPN0D/JKxjyQ6nQ84DN1ynHps/9ha7XWOz7xj3caf8X2RZGZPN8ljd8pU96eMM3bWa4yVAKwOg= 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:44 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 08/15] mesh: set interface type to mesh before setting interface Date: Thu, 12 Apr 2018 02:49:05 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:n0gtikmY7fqpi2viM+lAqt+39qw5aWJZlH3BW0CS9e6oEnPyXyMDW73s+Sn7KAXHTIEAOoQczx9aMihU1x/IbsrZEQa/H5Yw+EepX0GXXeNDXRDAFIqN5fDvlXj0da+scEaRVy23IocIvdns2Ivv/kFIQHrwRK5cTBoZQZ9yDmMZ8oStRqSxq//HZpncNkIjMni4vr1FGQ6eLwTiV9+JRio8IgX01Edhe52KWuWcKELuCrSzVh1UYffj6sLhTD2t; 25:3pb/WlfpqKwFMK+1un81ml/XZjIuKM254EzesYEEOCtQ86CUzZnp2GUcthKq0aAleZfKWNBP56MB+1wx86CR7Y6GofpcpO0MA2WZ9gnbtUG2X36LnI1CVRA0oj+JZGYgidE3kjDeO//Ea19X/6WvvVdphz+VFGrlX98ZNbVDZT/uRuaP3dqLVk90BCBsj+aM9xt3USuTWCzMgYpzbXML62iGxFWG77YBcY2D1y2F+sc8bFJ0w+pOs2OjP/ejJE12eJs8M2FFdjAzL2EVl804SCtdXOJ1oZ1sx1FWhVa7KjblszNGRU+s9GUkeWefuJRL84JG07dowuPCLxnY1Rcl8Q==; 31:iBKSUKqIRDy3kG0ffrGJ4f/KXZYjlShVt9BcFpXbNcr9989dNXzjxc72GQYTm/LlpprEOcA1znOPig/H5RGCcN9c8jV+18d/IZqTnoHpfcBQTqKL4guUf8bu456x/laGa1x3apcF7PYeKvnKemWQyFPYu6tz7qb1M72W09B/PPu0ihBj23IAoSJ9OQnpMh2auUGqq8A5qMkrfqAGUZDE27pWHUBnSgDw6pyfJsL0nuI= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:32BVkg2bj/ekmyL4F3FhoUOLQ7hmmTtpx4BIP5ZFqopw0+TwBJ5vr+uaigJQ6gmXk3nHKQhV1w/SaBD8Bu2HL4jOdnIUc0pN9YfgyhM/ISikD8PqWbiU9XhhOVrLutkLORBHFi0FcRKfxREZG2aYpPMDMHHGBeHbxYCNCp+Q50Jid9KlzgcJQ4hRc32dJ05gO0Pd5TVgCgGMiaYd+J0nBWUkjBL3/9cFQ+8c1Bu9dfh09JOw4Kb+E4ZzPnfbMC6FJeiiTL5iAhPcKmq+9k/nDvOyj4opFaUnXPJ7D4cIwzgSlQDtm9zn7E0adB+S9MiR6qVj8MioPOunGy8Ig8rxLg==; 4:cp0YcQbJg+BytqtZfxux35E7IyLNPYoBq9H1ju+a0M/QHYebIDG+h1qVb1slqeJY0/MRfo2q+rgmFCKZVQQadc4QkCT063cMs7RGznSypt2SjCQBPTArwo8M0C9nXLvI9WGEDq99XaoRv+DyLhuosoO5+O6Af8EzkyBOyJomHXbGg53q3X1BzouIaAOFp6cm+B51QdvS/uWjeO4EUb0IWD7xclNKpnDHSukpTn5Zfe2Fh4II8aYGjsnWBEZ/2SbKLb2YvFlra7Alk/g+RgBbgw== 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)(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)(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)(86362001)(6916009)(11346002)(68736007)(16586007)(6116002)(2361001)(2351001)(6486002)(316002)(106356001)(97736004)(105586002)(53416004)(33896004)(76176011)(51416003)(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:WpYpgypep08z7pb+JQ7wQsZ6R/I8MQwYW0+/YG0GH?= 1sUPSmJRYYa1zEek5eeoyIiUlsI5Q/IuBbX9vDBbdx9wXPcIDWUZCBVxNCJnsV7/u1dmpVC8ineYhrCPnHc2AUOPVJIiensHJTtczCVHj6+r4vbYJe+s6girlvSAkIa2O1eCe+VTTw5yHJqIHF1eHOlJHv5XhixTlO9QZNqVh4bzdDvCBZQ4HnTzsKmi3A/o37sXCXuK4THGXY5ubT8D0YXeAmanVEdOQuIXil5Kk9OVxfIQG4+JRR8MHCPVSub0FKOzr/nX08d2i+btl/IiSJeXcQToqnGkXRJN1a92HGZxFPBIHG1IVw3FOMvOTJpCWGcDlfjDDx2LQUHvk6DVMIuBQo50c2BjZkAWC6LGB+sjOm0G0e/yfz0EWXBoP/zIBhyXgcGdMb1dQNoh5vkMiiMqfal2Kr/QDHhfVB8BhS1BujPMxqosTAh+vqGUQJGzXgSLa82x3ubmQ8twfNui1jdgCpQM2WFN30nsYYudK0rm84EtFGNz65d5jValIN7/oQ0I188i80aN8GJJGi5fej3FEX/W+8S0rOA1uAg6wvRhHfi7WbXcdKF5B7+I1IN9VBZ6Q9pCHltGSF1Ao/V8HFJHRPnLOXcG7yiZqfPNksKS5+0z19Hkyr3/eQ/T4OMckmt2qsM5JsJAyOcVkI4auyHaNC/Ny74U9BuAgVRUBfRSXFP5LI1pUTcDi2m4CpXJfoj7QhpnAZ6TprHTcNdHMmfUCSomyMnqbXqHuAxnAB9T1+qSP2qiUaOn/tX0jCayNHtGzVvVEsT5+f7llNx0wmYnd8Mrv0pLPrshYubgOgKCL7S+wTSSFaLc2AhfOEmyIVeJ9VKqr6LMePVxkREqKAJ3eUwbhBhGe29syPc5APiJdvW7oq9xCTH/1gmNXWraO+kIqvGK/tgpKDFG7xoThGaggNx5ZIsVeAPQF2GMo3wnvYS51pSI6xTBX+yd9Q6vR21hV0xBFgHuLl2YjUNIaJNPNZAspVncwF2CyDJcnP8TTp5uU+FCFOG6pflSErJ3TW16skNd+LtiEq0dZKgx5j30xBvb8LKUQqPFBq4vf/89CQXfE2MZx/8pw8yl8r6j6wijfaVbYKkYv4fwSOAhHArCRVsAwUsyPxCb1KNAkLeQqMHtNYb6QMtVIJ3ctmuisTuL6o9hF98MXPix+iqjUch7Xdn2LR7paUZA+OIfRCbpGIzQFCH1jF7VVwQNtew71GPqvaGcL9n/3mg42bm+SrBpjzI5RXLr61P7DeOmstFK3dsXNri2BMJX+kFUj7+oyvNMCgE6xl7617EDwOUKGv0F8rNeT0TsxI8UF85ZrdvWiSVu1uZDWkCyN0jDAyxD3U= X-Microsoft-Antispam-Message-Info: NhI/5pJb7Ui8udBxqg55twVFyC5a+tPpIcsXNCU9HfSsxq540iNtGPPUvnAiJySPe1cIshWJoYPGBeEYp58Q6O6kJxAtWrNKDXXGI6rkXH6lxo/uajDWTC5LDsTYZoJsGOiHhaX8PlmsRh+aQXrJ0uoNILS66ApJCe9qG1V0zdl6tQ2ttBRXqq3olt/Co60z X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:Tq89jHVR0Cm7p/H+dvcHKLOfL5qjkOhbAzWHNPcCFRUnSz9KKO5fT+GcIFSmjcmjynnJC81ADJturjpJF2TetAhq5blUyhBsgZOFGkx3YPkfRJ+0Cv2cS0cYW3JpF7MQyN6K+SFiM3aETmNZLs94khZ+mgXJckbh5q2k3f5ttICQnEwrF/etky3Z+OaTy2qXenSeME9J5gLttGKyWn8qD2ksz+7UCD+Zvi4D1/DIPQINUk2nSYlnpDZRZdjqNGRDTt/8N+4XPhS1UzCvphG89PiiL3sF4hDbm0qUJbeSJw4zhh5NX1XwdTVt8vIqrDSDEj8r5QjrD1KhKUulD32VzaWYRIZKntxZ+OMjH2AvBquL7aurxrugRlBVxHQUA+Q7F4evGbEfri1ABoqE0gMKp7iKjc0Rus6l4Vci/90dq0mYGU2rSU2D37dNJAwIXYS5veoSV8Dqbfz4Ux13/ftL2w==; 5:t/gjoNzi8uuf1WWwPitIdNJK0RSNvtkYulzOt2qwc3ey08pcbNZaedLyN543PvEm1/Lln6Fmm+qpfjcb+PoZzmxgV7nR2InaPTHk+1/EmJ8/vfMAA1q3K7n1FUhOexejekVJY7B3Og3aI8hOBJHgAmChnFZmBj0R9o/0XcJpNMs=; 24:fhunzZ9uYwj6UVfYMZJP4IbemI1B9/Ro/+COIMYMER6SNtQmZp1CaAiyV73ipu5kcBf0Tu1aJF9BKmuew99OC61xtvLQZQY8pjubCt1jGqI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:En8au09qS15eYyaYc2vdFG2xLUXbqzOxR4YhkMNW3ujUKuYXhcn2hrAtoBtrKA/iyaO9YxfMdK4QCSpIzeOh+eRDpzp2X3/i4AyA2VJBatyvpuD3K4FPXuvRpV/oij/X/BHY/K2FGGhXnJV7D8s4KJ+Kir9Ruvzvge6+dXUU+yE1MxGX7ikt2GfmElxJhhnYyi/uYBMTzC1NwUHKWzS6f03lx0yTlVzoTadigIpMaFo4l5Xr+5vCWrdKT1JN91rH X-MS-Office365-Filtering-Correlation-Id: 28d7d6d2-d70e-44a2-875f-08d5a05ab8bd X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:44.1909 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 28d7d6d2-d70e-44a2-875f-08d5a05ab8bd 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_024959_819408_6F776C61 X-CRM114-Status: UNSURE ( 9.45 ) 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 [104.47.1.47 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 Correct interface type is required to start DFS CAC that can be triggered during interface setup. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index fbed375cc..4d4d5b5e7 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -336,17 +336,17 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); - if (hostapd_setup_interface(ifmsh)) { - wpa_printf(MSG_ERROR, - "Failed to initialize hostapd interface for mesh"); - return -1; - } - if (wpa_drv_init_mesh(wpa_s)) { wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh in driver"); return -1; } + if (hostapd_setup_interface(ifmsh)) { + wpa_printf(MSG_ERROR, + "Failed to initialize hostapd interface for mesh"); + return -1; + } + return 0; out_free: wpa_supplicant_mesh_deinit(wpa_s); From patchwork Thu Apr 12 09:49:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897590 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="SVXouCap"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="PigMrERl"; 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 40MGQf5gKZz9s0x for ; Thu, 12 Apr 2018 19:51:54 +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=zindxoCTM7nmw/9l1dkq4WiJ0c+oNgN4NI5LIGur2dE=; b=SVXouCapf76dOD goKGgg6DfehuJJGM1Z1j+ZpZH4Cp0mrHCU8/bjT393fJGtys4yCBdiUrtfZppANSa9GCDtCu9NykI lD2mxx8obb6/VGMVM8R3l0k5W6uEkzwxxg3Z9eeXN+BPqpyiCBxnwjDpARc4Nn8olnTdjM63IuLaR Y3jjFK0VEIMsrmNIhKK7B8a3aJtdi/lLcR7M4tkAn74QLL4yX00Bi2DcjHop3WDK30yHaQsGqWNth AUyPRs4NsYJB+WitJBLHSt5Ssx2yDOXAmRXBQ/nFjPMnSGqF8JWPSg9dEI6qMvnyGuEK0fcBVXb0J swybAsy3dvUR+x6EqsYw==; 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 1f6YtS-0006y8-PO; Thu, 12 Apr 2018 09:51:50 +0000 Received: from mail-ve1eur01on0082.outbound.protection.outlook.com ([104.47.1.82] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6Yrg-0004Or-37 for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:50:01 +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=2xqua0Tya7VTa7+hBaxFqtN+QzgpM26jPo54asoCZXs=; b=PigMrERlvJj3ySKRg4/AxbAoEzvxTGEMdzgc6vJ0KfZ/eD0qbg31enu5QmJLNZkMFnB9EWhWA6+qXnfc03Kklls4uUwrI6gVTaXawtf++H4vbPIWgevRLscU5dwfmCswFYgp13Us32mjKdQ/2jcuwP7YJddYEaKvyCe2UbqbsGU= 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:45 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 09/15] mesh: set mesh center frequency Date: Thu, 12 Apr 2018 02:49:06 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:1h/pyRtPbq0Cp/YTuTQWo/YMdAicpWJDixhfG/bYFLV1Q9V1TzPZxgU0G8ZOs+n/ECXhe5u8OcdaeoxpcukjFXMBD7bwCQGIec+O/i8cYnxj89BPvHiJlZoVWz8uc9N4i0WILVcYYEvzZ8DITKw7wi4BCs9yCBGBbv7fWemH/PvMuvfAPiGl79guKrg5uI6bCduzxvLGvsr5j9/uewWAE19etSJE1Ft3Jj8Ssotwk0XNUTTtnarQ1r1HnAl1VvOJ; 25:J2dwEnWt8TxZKMUWqqGDmlVbFiUTkuaTC31Nb21mM9MTt3nmp6pX+Ot7puwXCeoDj/QRsY0d5IrATlc/lBfepgy0MTUbIFNocNNmI6FwTIb5lWDEWXa8Ha6oqIWtDA1BFbwTlRi0w7c7SVkrzZ1OdZS3wc9fh7K9hIJ1BphZomB+4K47sMY5v01DcQjjo8w3z9IQJourXJLNYkBX/dnajqaHWVFy10FGpuRfHSalT2G2B5G1trDTUnCRO4Zw9NaDPUp8VsDaRcH2nEBAA8saozE1JXZPQeZj1M5tUQh4biRs6pocpEUXPb5K/O5xJWmTaoqFqZNvFHA3KcKmByf3pA==; 31:JN91GrYS8gmNaE7M7JIHKQ1tXR1zQoXWaMTeoeCEekhVtXBa/l8LTy3Ip/aq36s4tpIoxTg1JVWSn7ymuXGA1GLy68bmiqB/SHIN92mdMLBD3X1fENzbHqw42MOtCalIrsoU2MM0WmEZvi6VEzzDnMFgHy8agOQ8Vs2F/CQ9cCLxjyTiGyDyXU0nUmmkLzZFqfYEHb4k7yXcYGfIuTUkcuG3+b6VrP7GNq4UEnlrpqg= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:1MzxYV0AIz/ryzH0jLb3TAwNstNolxw/XvxL9babulB8nLapdPADgVZAWqWiSIaxD3z6dEpB+dSeQOSmF64LlWIKVx0irOzxIwMKBvIpnQACNiJe55cwYvfjNcqmULBEO+p5GXHiFadJPqhK3zJQWTTZ3IcttGLpqNyL63HA/vtvEQc/wb6tXWXyQEH6RDThbfwUJWoUHyzaAa14TJrUrcMlAcICqh4yQRgkl3Yn6TiruSTmC1hGAo1fXx/KG0XdKg3BY5cCK1YvQKRQfG7VZb1YEMVwuW6paN/dOiRyC5rEkN7ZbgtkqheunwKgzXXNxLt+S9WanCP/P5PNLB620g==; 4:XHpP3dW7340vH2aG3a+LkO1hcZib+gn7lLFMKlpq2A9VdRKkwNE/f7iDAMEQlx/yLJSSDvZ+x7jdJSvwva2xLqainMs0uIXdNgfwwMkuwjULAL838Ktvod1fTihFeVjA2t8Iu5pgTjCCDTe0am+650qCkieqGjBQLVgCr9Upm2TQFCrTX6po0fMhf3z24H7EYTXLm0VAeHLbopFE69YpcPCGZ2AHfn4De+C3K7tQC0Xr0/IVOtB8T623Q7fReQXAJnp9sM1LP4pz0z4x5G6ScQ== 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)(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)(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)(86362001)(6916009)(11346002)(68736007)(16586007)(6116002)(2361001)(2351001)(6486002)(316002)(106356001)(97736004)(105586002)(53416004)(33896004)(76176011)(51416003)(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:g4XZ9GLiFd1B3Y/NeOkwQEpy17X9yuKTsVfaB4laL?= lxRrKfAO0AHPdQwHEnp6A8VE3SMFXF6QQeQgrtPgTUM9QoKu9wafMq6qBLW7JqbsSALrPEUjg+DUKxLx/pCtYFpSUS0RIovQC6/WULnfhki3rK205Ugw+rv5R2vZLnzNRszPedVMyaWaFpOXwBi3Lj+xShUPLDZnPDeTI3DjRIabKsCPRsM5pYr5asMacFWU1IalUl0LHas1NVY0nt3FaEEFJBsQ663VbT6LYh++VL6OO2ogIP6hfoABJ5cMNAV0m95evCNynRaC1pQmoEHRycDd6+J2HPHbejaQlUg1Y6Jtk4aYFRLQpbkm8bh3Fe2DmXQONoF97Q5vobILmKpnkHj8jrcPvrHzPT1GowwNLqWjqXMBXjc62VRZzhqnJa0VNraFTzNpR2ST0a40siYKTUHzOSf7Xs6cCH4dC6tMfU2j0YJRx6Ym9z8FDepXLzidzvzS1dPv4e83PbyLURv+mppZFucifO427FFkIbSy02YfXdtgEKE/1IFyxeU13zzve3fg0vy8tIsJuNIJOmmGuOIITnzn8iQapauJDpqrIxTSXHCv7o+6X3UNK+ezdbr1FR78aga4vbNaRoQYSovgYvR8m2o0r4FT55qKuIfVWyvrVZgjdrOgZvuSxpG7FaOBSTQTqNyL1nWegSTDsldl9n/cPwOJY2fzZgX3eIt47qwKUJE4nkAYWoY12hlli6MXt6UBTcP+VOxFn3aaq4EUTeReU8uRs7jAcJa8Jt2xPDiJkb4cjO3wqCRWebyZGYVv3r3U/al5nm35YCfiemPpQGtKV9I/npv2gW8HPPn5VQB6RVHWzZmSQ4RkCZV+kDQYHNH3TMBD9eQqterelkQURqEa8g6550iOpVxkJv3ToaGWVOk4xV/Nu6iH5NinGwMsUbzMBghe830iQIL50D8gXdYQSNUsF+vEQZ+mn+snqcSoQZYYnPD9SP60sLotRmB2zXBRqxJqi334DfCi/qGg+PYp+hP471le5LAeUL2NCOPvW4EU9zCNytlnza89yDlr7pdEPtJ9o8/HhTKJxY4+BXrmPt7PgVHb40FWjmPzoiBGz+32PDmh84ZCekyLmQHSqdRoP/us2d8ocgeUdCCyhKmuTAeFjnLwWVXolwI40VwURVUIfhQ6qQ49SHx3qFJCUpId2C/UlbJ+vfN43GBuxq+zQpeAT+ONxoxE3+N72JxtDVsK0Ac7m8/+bwr21GU848kI9KIvxZAChzoIiK68KDekRMycQPaJoM+zQe4v+3q98VaSxPnaYu+2WBRFYHFV9yk/V4mTP1cULBfNTfeDHTQ46MfwUC6xVpeT3PAJC3JnOQEzhFTrYfiVm90/g1S9BY= X-Microsoft-Antispam-Message-Info: pgjJUHeJiSRFzuiKNYl6OXNKynHSY8fr+LcKK9MkA31H0DmhNhTGyocQvoNIHLvBsrM1kcCRgOlBObEE06z0b8J2XJOndwJAtdNkO15dD6ZrWxWDmuPtMy+GD6SBIGWs1Km8GdeBmboYv3Zaen7cBiWAHi3OMf4OsGrQ5Ft6eaWxuFNatuphoaC1dC0fyPmJ X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:kxh6L5urfht6PIt36hiYbjWTi+Uxo9XjYGeBuw1gjk4eAysrxksCMtSQ5ypHWkpQlPvs2A96NC7M2WeEusEauj2TDaqOKndR40NH41PjLl+egdVevFgEO0LW4BBJ5ZfyJFwrPk/pKTHxZ6L8vqviTyDo4YL9K/MAZqyvSx0aLPTHcFdpPIsmbTIey2CPLAsVzTdS8MipIGfvsYaE5v1f2mnGbAK3Ov4otpseCfUWpFGzQHDZ3lsIY6PIkcEGBcBtFAkDCrrUIeffLDeWoYdAV9RbxCI85ugwUe2vURrUp5Fg90fiV8pu/lCKGmUj6cr+EuGG3HcJ6UgevlchlzT9uUBRzMMHnAW4Gj6u0q2mHUv782ntt1zrZ3vkQPQ12UX2WDwujvnWboqklvOiPkunr6/369DzwhizMEkWckCNTg0VEkkUGVUX+GRkAPSsbAdIi/t44RtfJujECdrozFuMnQ==; 5:3SVlvJCRUTjp0WU4ZfMqpwgU81DGAoax+C2whAw5ukfc93D3Z+z8QnvT3LGi7PwYeoJHEPc7rSLcezWdGD2+rey+LKo6co91QtThuX6bgSL7aWiOCQlxaXo/JtMN8fo6H9IKbXmgeoP/WGIs2Ws/0gURIX+Qkh+aTjjMJmsV8lc=; 24:W/kKH+pSVH0KF+HCZRvO+DtQTvGb/1iiWoBjw8lKkG1sEZFRZUh2ShCkbq1PYy1ElzaVXcm98V0Y3GNibTU3NLfDPqf0z/3ggZTmL33IgDg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:wLD9H6DGXvra1nMqv7ZctlmUyOH74rDgwkkoVZxS8s75ko6T7Hyo0bJS7cvjnEM/mEWdkkzO7Exui3+scfJv7i83kr5uz6GG5NyyqBp3oAHtzfFAdfcF7WJSFQKcQ018WJ+OJwDbEO93HCmUDxsIsKp+uu8YJbxcm0+CRhbC1CC8cEiLUJPeB7pw8fSZJYct4SxPJCsWOF8y47PmMfMOi4m4ZM/ZmXVvxinSf8xuNlF29BSnwNbPoJML+kW5BJ2u X-MS-Office365-Filtering-Correlation-Id: efcdf229-0fd2-4860-1e8f-08d5a05ab994 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:45.5816 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: efcdf229-0fd2-4860-1e8f-08d5a05ab994 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_025000_174561_B31084B3 X-CRM114-Status: UNSURE ( 8.33 ) 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 [104.47.1.82 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 vht center frequency value is required to compose the correct channel info. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 1 + 1 file changed, 1 insertion(+) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 4d4d5b5e7..9b313627f 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -453,6 +453,7 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, if (wpa_s->mesh_vht_enabled) { ssid->vht = 1; + ssid->vht_center_freq1 = params->freq.center_freq1; switch (params->freq.bandwidth) { case 80: if (params->freq.center_freq2) { From patchwork Thu Apr 12 09:49:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897592 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="S7kdZqEG"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="cq2uOpUh"; 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 40MGR730vtz9s0x for ; Thu, 12 Apr 2018 19:52:19 +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=d7S+ZNqdIWm+xIXfVcDsOQBM9zIczIDAD0ehyE2kMsk=; b=S7kdZqEGWtHHH2 iHjW7aUuI4F1pP0TAZnnnhkYOYy9u9vK1c/jQ2Hf8pu3AvqeTZVspLdtUo0eB1Q/xDi2/J/D1r92o jJslDXZzvzim52Bm7Cra9cCIgs7sgl307CUdsiAIMoqj+R0rSAy2uacLC+v2SvplUB4ScsBm2ALWB e6blK5C6ZaNxUI/4sRKuYKlP9ZCl3AO2CqEzzW1BEK3mc77Ome7bhDfnt4bsmWRTxBBrCK0stHvl1 aUDDqY0AXZR9+m0+r3dAM48ymihSv1Zo4xyywiNFIrvgpklWXcGjqmzZc0Ze/HiDjh4gPEpfS1Tax 4ekdfGYyz5T6Afh7MhQw==; 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 1f6Yts-0007Re-94; Thu, 12 Apr 2018 09:52:16 +0000 Received: from mail-ve1eur01on0082.outbound.protection.outlook.com ([104.47.1.82] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6Yri-0004Or-2T for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:50:06 +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=aGdElHFDhltrWVgHis4QQo5Y8xnzqZUFinJKxDC4ivU=; b=cq2uOpUh+CApesB26/KB56cuFf0WVKfIpxaDChqff6lwwzQSVzSGTFVCqU3oXcG0DDzcK3MQ/ozD22/moZLHtTvAdvH/eKBbXUwsLkXnCI/No1bsa7NsqUZbmKf6ZKv3b/r5PUzrO3NtpIIEJqn+sVLpdvytwkWCadPHWgEEEYw= 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:46 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 10/15] mesh: consider mesh interface on dfs event handler Date: Thu, 12 Apr 2018 02:49:07 -0700 Message-Id: <78658741d9f30fb4fc939c878f5e83017a72975a.1523526306.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:+r055vlLYE6FtM5dS/9mMf5MVewAw6fTaaqTEbHG6T50AKJb2isUKRxTKqdhOpQH3h2RWFyxbrovzN0+9V5oYJa0jewfgi7TC/+lgVXvJwqYptKuHBlJlJSiSz2iOcTrs3YlqpEwBSxstSDWK27n/7dDQltGNU/7oYu7lxVBbpjP8eg3rka9hQtWfkZGVL7ssask5PUXA90ni08wXvsjsWkrxN5HfotPoYy6fKz+cSWW31sOym65l2M2aw/cseHH; 25:JZ73B7hDfBBe8F2Z3+bqS9KT/9j6MXCBw4WR//j98jK2l1LG+EBxKpEEE3eEfqBVfsPcLIB4mkdWS5aBPMa2fnANTiJ+/5BXWAhsCD0kZjYFVLWZS9Fnfyba3r7sGY7gLpu7KH20xyUN4wCX2DersqY/jAB6jJz+rGQ/vkKa3w+Icp7CB/6uapLciX51P+B7g8SStHptFOOopH/4Qz2sP3dZ5Kb4UpPOZFM8O9+teSnqrwGylKpE8p8WdBprV0xPfuqwNCnZBKy3+/GZKdIxc+UK+OjpYH7Q3z+zud1rt1cllrO2oGNCbUNtSryiuyZqnbArMZzDFP54ZPF7qsSlWQ==; 31:YKprm6sHV+USpV0M8B4DuGlOikR6IdYDM9AvT+Vamg/n8k5Q3NlC8ttAuJxqDIJkKFKVvWgHm+m1UEjKgGnCVdhJMYi3rAZeuBx4lozlcjrvBx5OxTSuvl6br0UxZo7b2gmWVuemu/i7zEcKsZY9uCsQ2Vs3Ox3RP2TjPmLakaxdz2qizcd12b/MNT9Grtblyzj1PoBokc8WCEKUOHrxyJ/7pElJRh59gE02CzxVhZY= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:pITVhqPDfhOfBvDHShJVhKpwttiukHyJtig1oUxcyeKG2e4cQWT1sWvzWHhIDS1CwDXjo+NpUlHJp5vQfS2SEmFPTGVh/RJGkzzqgESl3b3XD4XrtLgypX3kRL4MhyPA0TSfFWm+78nCxEyY1YnTvT77z+aDPZTXDS2ynm/K132D0AmTfgUNT6Z+VxiugeOa0bCXPCAveu7CKLsv5FaYOGZoSKpSIV6BSbBQeCdvRujiOmP5JofzkskcI8Gx7h3wYPbP+QQuoh5mpBxh0hPMYXEwdaSj7HwI6PXHnx0eeIDjNiJtqU2SXuNB5kAOSd4Guwx8UPwiGeZ6nA2SNZZv+A==; 4:XI8+XfulRozcOlsULYiRbQqKW7okv4hVldXy+nfn1hMH9GTBD+Bal+bFh8PCM3S//3Nkf3ZaABMT6AOxeQtmkahbZtdncDo5ntjEVTKJSipghFNZk0NMwzK+wV42AUr6p8b22/tOPNN1gDGBomoQTCZ8iNem7H4Df2lfqaoV88QRr/UQw8nKPt7F8620NgQ5sN3JPdzMnuCyJ8Qlr+aX5kp76/NC0sAWj8GJVumOZlNjc3CsX01Te9X70P6VF8y3GYmH25cHQiZUlBh7MI/jLg== 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)(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)(86362001)(6916009)(11346002)(68736007)(16586007)(6116002)(2361001)(2351001)(6486002)(316002)(106356001)(97736004)(105586002)(53416004)(33896004)(76176011)(51416003)(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:dFOqjt4W1RB2BJyBWw+nOtKoIMOWG0Vsbc7pIymkc?= nqwPt/02ROi3oKMFBXBUSUU79MUN2OCBGgsdIxXPLgDvFKdOvXV+30BntrOexIhXgUroH2z5v25l9v5QRsnQGfo3a82VvUhU5pLiPfYc3Ux77KCePY56js2XoCY11SwJot9+zISEA1wZUnHr6CQvC3H/3eQ2SgrVJuW4j72SohgnkCBzJxpwJ0ms9U4ZJPCVp1YSELUNTMaO6bgvbfcMmJnrtiYW9DG1L6Cn0LaWzn0HCY2t44gdrr+OWrFMuilZNDgBDJZgMsdMb9hbD7RcLO8xrzJbBestgFEJ1G91fSRg1HmjbLuiDUKOeW0Ho9wORzZ88CRtYvJtNyzwqvb7cBfY/4vyde+jM+2yVnNVob0OtU7ta/20W1smefY7m1vLrhA+SElavE7OK3jj9b8TLOF3gwnY8mRXXo3bBsRK/sfLnuH3X+noxwE3S60/L9mNKx+JiNleOkZOYLhe7ntACdDA8d4Sm+TTRSQGrJRt3ZlkrMeFL31TGwa5CTbRvMi0ShN534W6WTauLaQ0CvFQEpk8cmzOE6/CMjzofc/JEUmUU0XwqEGET30cq2GrQzXswE3qy1qHj0hkZVfz4C9KLfu6I9PCB9N0Cy4mSs0Fbxv++N+RGTSalO9erVw61ezc4YRsFuklG39+Gu9dFPvgqOTua1vy5FBARLLtKLGnr9OgikCbmsW5OWoxb1iMmygpqcxEaopUnDh+VAvLFF1SBpozDxY8e7ZWaXmtZbdTqXK4mZKs9yG/zt+gruXkNU0s9gllA7VnRCnPrw/Ta39kgKOhqk3UIDzwBArUZVIkY/LwMQAy7RT2zaVBaPPV5U2I8RsAMZEPuWnCffL1cSLp/5ogUnxwvQiI8w4J8wrRvwGZtBIRf0lsm1ed9rPpbexD0R3BfitQDz9Q6ssrR43C7jSReKvBfMs9Y6x3Lyf4/l7U8dVCuRbNWhN16bpryB6wKBj5Guo7HbWTnycAwLVyliOhoWQbtWDHOJUe7Uj4uVO99w6lsvmY8qnaHrTS4Ax2p7y7d1wpbXRQuLywbpjXK2IELBOE11UfBQiZBBqruCEGHAuxZtkmkwnnB+OGnwtkdmiUAIjfg/ESN0h3MbMYJ5Df1/t35VYzdIyFt2sRynSXszeJ7p9Eg0jzuXKvXiAzZUxdgLmn6MBBvKQkoX11FGuz3oUMDsMUOeTcpFPOtQqyIicdXvZUcWqtiM4nLvcEqsdPfiu82InYYOJseeChW4Cw+8uOfdpMjw//fVUf6QdM4H+IXvBZe08gsqp+JQnvJRYNUJg1ImlGc4HRcRJ52fcIJ2TKdUZID5OQ6xwaWSMwoNuuqqEhOlX3tEikz7FQQrGiSV5NAWmFF9ULtbx4KDM X-Microsoft-Antispam-Message-Info: KuYoqW4+QhvfiTPJKpnzcVnlhcBYQs9isngD+tELAVI1coLfRCfulwsNdwPv6DZ/Ah0qn2K+Emx8ql0RxNLO1ov12rK0OUu2HBHe+nuU5/j5rq0CzxpJ0sbJIQAa+quhLAnGhxV4xMLrJ1nuYBQyN8ilhU/JzPWRMiRtrug/roejkWB5B9jWUe/bRF4Dh0TP X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:e6cRwcb32kBf5wWZquj4EJ9Z8phSaYgUfcNuxezrTQKY/WOWQmF2hE+j5PXpz5ThCsIFFVXpUMRsb8mk/AAr0HKhCxrwvMnGueCh9rupcVWuckRL89zhRIp+pQwOldxdc3ei3FxLnTXqr/zJFsAeCVnTVzDIuicdeFbQAPif4hgU0uMFdU48wHJwIHQs7ZVuAXab3bAb59Xb8b/Bdy3mWaahnv3L7WGKZ/WEOk6Tc50ejHFXAnFM9zouH+Ue+aShHbzTD9u5DOHgbP3fdJ2hTR5Xf2AEHXbjtiWCL3GXqVpHdWOcfb+fGKtufd952EDF5tE60txz8BDrbeaxBLfO7PVA7n0rSA9a5k5sdPyx+92nTpY4n/D5d05d1rS++AZamAdl7yjTxrRnh+AYLYy0Yocfgdbz2o9RmLPYbsZgHl0djkHbdzURq0k6Lza4OQi6ChyuehqFcAdP3hytH9V7VQ==; 5:7smruyd2AqkszAYaGgLMzHVqavt6sjwqa0e1WRhrCDdApA9OXikO70rUbgWkOidcGSOIF13/fWi94qY/ONWgAJZ5YO4461FN+YxytS2FuEkX9669zkq9qMQaw5A38Dqq89I4CTsR4SQytF0qyeTjqb9aC9o/AqZwYxg2cBM8rwg=; 24:vJwMkloXKPXL5QIlQOm5e/4Rb8MXLf5w/O2m4r8IOb5B35loKG5dkgMtlRq5+p/iHGvfeCHBDQoxI2vCdlgA58YDP2LmdjdhIhnYHRWdcJg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:XSFDadbP6EsXUtX288lSBJhg/4bdsuy2q0g+KcVjOFgOZT/3qmZtHzeJEeGhuSaZJhiwRhrJzDRGJ8DmR7dHWk9R9M3Us0wm7v6F7ncE5LLqJz4YOysGQ+nWs38EzEabybyks/40EdeYmf+ciyHpGSnH0Mxu25vOo5g6i0eDSogu5zza0Rl0K6+l90QNcPQ7EQ5zc640xJWUj6q33gt7u3oPC2FCflNXIyb4/+FAq0pLiLqH69/4wj/G7TTF6sHV X-MS-Office365-Filtering-Correlation-Id: f99d12bc-21c4-49b3-b5bc-08d5a05aba6a X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:46.9880 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f99d12bc-21c4-49b3-b5bc-08d5a05aba6a 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_025002_273730_6AFB660B X-CRM114-Status: UNSURE ( 9.95 ) 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 [104.47.1.82 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 Once mesh starts supporting DFS channels, it has to handle DFS related events from drivers, hence add mesh interface to the check list. Signed-off-by: Peter Oh --- wpa_supplicant/ap.c | 55 ++++++++++++++++++++++++++++++++++++++----------- wpa_supplicant/events.c | 1 + 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c index 679b34600..17b32fb34 100644 --- a/wpa_supplicant/ap.c +++ b/wpa_supplicant/ap.c @@ -1328,13 +1328,18 @@ int ap_ctrl_iface_chanswitch(struct wpa_supplicant *wpa_s, const char *pos) void wpas_ap_ch_switch(struct wpa_supplicant *wpa_s, int freq, int ht, int offset, int width, int cf1, int cf2) { + struct hostapd_iface *iface = wpa_s->ap_iface; + if (!wpa_s->ap_iface) - return; + if (!wpa_s->ifmsh) + return; + else + iface = wpa_s->ifmsh; wpa_s->assoc_freq = freq; if (wpa_s->current_ssid) wpa_s->current_ssid->frequency = freq; - hostapd_event_ch_switch(wpa_s->ap_iface->bss[0], freq, ht, + hostapd_event_ch_switch(iface->bss[0], freq, ht, offset, width, cf1, cf2); } @@ -1531,10 +1536,15 @@ int wpas_ap_pmksa_cache_add_external(struct wpa_supplicant *wpa_s, char *cmd) void wpas_event_dfs_radar_detected(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { + struct hostapd_iface *iface = wpa_s->ap_iface; + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; wpa_printf(MSG_DEBUG, "DFS radar detected on %d MHz", radar->freq); - hostapd_dfs_radar_detected(wpa_s->ap_iface, radar->freq, + hostapd_dfs_radar_detected(iface, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); @@ -1544,10 +1554,15 @@ void wpas_event_dfs_radar_detected(struct wpa_supplicant *wpa_s, void wpas_event_dfs_cac_started(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { + struct hostapd_iface *iface = wpa_s->ap_iface; + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; wpa_printf(MSG_DEBUG, "DFS CAC started on %d MHz", radar->freq); - hostapd_dfs_start_cac(wpa_s->ap_iface, radar->freq, + hostapd_dfs_start_cac(iface, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); } @@ -1556,10 +1571,16 @@ void wpas_event_dfs_cac_started(struct wpa_supplicant *wpa_s, void wpas_event_dfs_cac_finished(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { + struct hostapd_iface *iface = wpa_s->ap_iface; + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; + wpa_printf(MSG_DEBUG, "DFS CAC finished on %d MHz", radar->freq); - hostapd_dfs_complete_cac(wpa_s->ap_iface, 1, radar->freq, + hostapd_dfs_complete_cac(iface, 1, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); } @@ -1568,10 +1589,15 @@ void wpas_event_dfs_cac_finished(struct wpa_supplicant *wpa_s, void wpas_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { + struct hostapd_iface *iface = wpa_s->ap_iface; + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; wpa_printf(MSG_DEBUG, "DFS CAC aborted on %d MHz", radar->freq); - hostapd_dfs_complete_cac(wpa_s->ap_iface, 0, radar->freq, + hostapd_dfs_complete_cac(iface, 0, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); } @@ -1580,10 +1606,15 @@ void wpas_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s, void wpas_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { + struct hostapd_iface *iface = wpa_s->ap_iface; + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; wpa_printf(MSG_DEBUG, "DFS NOP finished on %d MHz", radar->freq); - hostapd_dfs_nop_finished(wpa_s->ap_iface, radar->freq, + hostapd_dfs_nop_finished(iface, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); } diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 7c5452802..e569093b4 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -4168,6 +4168,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, if (wpa_s->current_ssid->mode == WPAS_MODE_AP || wpa_s->current_ssid->mode == WPAS_MODE_P2P_GO || + wpa_s->current_ssid->mode == WPAS_MODE_MESH || wpa_s->current_ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION) { wpas_ap_ch_switch(wpa_s, data->ch_switch.freq, From patchwork Thu Apr 12 09:49:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897591 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="g77WZ/Lm"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="F9Q6tLGE"; 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 40MGQt2XmPz9s0x for ; Thu, 12 Apr 2018 19:52:06 +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=khzo7kIIb2TBW5qMITJdNz2vjU6Ki74rXerGj43pa6Q=; b=g77WZ/Lmy2S3sU O0tbl2HiZwagQwSNi5HO0AcovXn4VhHpbZSQTY1iocVbYoR8CJ5HnNnT7AYHUIvCLR+gAv4ttTw7V 1lbtASA/ZezjFLNkQR6JyrLfOh/Wi0Xl+WOnyoHvEHMplX9BN6zSqTjiDuc15OG5FquWXftrvIe8l hlMf4IxZfNCqiYisyylBOgZa+Hpmmeg2QEZGg0sbPUcncau+YfmYB2mKQ50rDEuJYtTX7WGIU+i/G FQq6ctDv8Fr4ZHyMoxaocJcXv10tojKR/01GhoI/ALB64l80oLrhcvNW1ZOaaa3MHoODasbQ0OyNI pk4RmoL8Q9+Um+LgZKGA==; 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 1f6Ytf-0007Hn-Dd; Thu, 12 Apr 2018 09:52:03 +0000 Received: from mail-ve1eur01on0047.outbound.protection.outlook.com ([104.47.1.47] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6Yrh-0004Qg-Kb for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:50:03 +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=R9EvzaQtyku7l58UZ3+lBmo3qFhmNiuc84vL3wUo1pc=; b=F9Q6tLGESIJm27+/IGiCKP0lwwD5l8vB0tugBL3A8GUcelGcMNoZVFDRgbv5MWYXX1wKh5nVGcG9kN9qx5Y65ZMH+jvtb/tBMQQxcwcgkr+LvTO0hHOlJeVb9m6g6tF0DbChX6JFtmIpe6mkCZmlP7gkCn0LtAqortX0cIRJGhg= 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:48 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 11/15] mesh: Allow DFS channels to be selected if dfs is enabled Date: Thu, 12 Apr 2018 02:49:08 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:3+RrGzx8pXJgvzoOBMojacwEZ9Pkhmrrs1hqKc3lPe1KdGfsItNNDairWbvj/wb+hkbvPLLr3pnt7XXhp24GIURCHvhsFOa990SNgbP2CCpYmt7tyBV8sqJO1MOeRorUwEDXHR/gsHgkhsECHwXIRbc3+af4oNKQ1ymWBUDvNdv7M40GNU4Dc+zPluteeos4/s3AT3BfBe0Y9G0IJ/QpfinWliSTyj1g/GDghRWXU9H9wMjvwpqRr4RAbNnIkrH9; 25:9LxdbZqtOCgr4rDewuWUQ9O+fxvInGa++C2xMXVkkUlq9ed2Q69asVe0mZ1B/VCghyiVdgc1r3qxCAeR1MR3VUAOmATtL+a8ZOWZRNHwsrd9bh+Baa1eH+Qs9O9D8ViyCqe9pZ2wHOAaWY+rZp+RcpAyzYXgNPj+Zoto8r5UyUwirdYzYDjlNLKVyz57o5/T2dzZWucCIrk2DWLKbue/74+IGDPPV3Mu1qRGmQS1umYgcvtnLY5vEnntaK8X0SSAFNl5rXC93Y8rML2d0PtjLVs+vOotyLXQtaAH7yZmrMhGxkhW7/vb2Akqm8YTmLUxBjsTKVVDF6kAht2NZhLAWQ==; 31:F1GjJ2D/WMoTdaERjtWRWPQcPqr2ObQecfAxhZ3ug9hTIYKEkBFbme9YYaFdIkCS7WlylU7ILCcOOgN1XeqPuMbITsXXaANaZWpAu95pFqsw/H2XiX+tstrA8ZUp7MVUi9igWeDjsAGAhaLKba9tDfdOKHAodPTRCASTpwjDg/IsLdZadpatvCxeDt4SferJ8UL3Hq2KzEP6b4JENzXbxESxR2BmE57uZdJVHiTBdoE= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:mj2RAgcxoWfnLRoPYm/8m2jltgWR7kPTVWicux1+Z/pUjDyh5MPkaqxOh7m2eihz49OvjcSVfo+dwtcZthwU2YaVn7qD3J2ua1b0IwEFUc0txdb1Kbg766JPgWvm+AS2GjdkBI2TwOHf+bfL0PtWCXPh2frhNhohRLdIAle7O5cg1HRQfU1q2+uvdJNLmV0Xm/+5egE681uOclzuAN5Vc1sPRjjU/qQlD4sWR7tEYQyKdh/HualGMifZ2QI9GhQDRbZ84pi0K/if3pYTK7hNIjWO8vzJCMzB42zLgMTEnhCBKFqFwnosalDFBxblmYQ9twyHAm2XtbW/GBKHFarnUA==; 4:p1uqTHimn+gchzWXnce/+UyF96XUpWAnp2FxaEyB4kBxI0KXF2vUL2kdLt1G50SMaV1GEXdRXHFyoj1JvI/M2w9N4/X3In+ckYlzoEXWyHebp45CqqT7APSKLWkrKOUCQFJEY8yrtcG51I52+b5rZqi9XEAVXznrF41PbvLkNXGRsL18mpWf6jhSQNXPA4mcEvg0/GQw8+iGuB1G1AnMQpMPdKoOGTUP0gtz74qcYvsn/FBm47f0ZyGPrjGHeWLF6RyyFcb10jH39Ap3+wUCHw== 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)(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)(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)(86362001)(6916009)(11346002)(68736007)(16586007)(6116002)(2361001)(2351001)(6486002)(316002)(106356001)(97736004)(105586002)(53416004)(54906003)(33896004)(76176011)(51416003)(59450400001)(4326008)(386003)(305945005)(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:vQHNXNTJzWK/KHA81HENd7ypsmJCzTJ1BjU9Yezwu?= gYRmxGjeEQDg6CeOoXiaQD0mjNSlnNS340sKBNtAjm0pYw8xfPwNsfE9nUvMA19u1XqdQFLn+GZg9U8eKymZkysyxK1MJnguwjXLSgkEL48/KpBd/tUV0GAWsfGranzU5BPFw9jyiKWChJdQhEYgXIH2+OoEoThpwdOL0nFdexBL62TkG2F+rBOwKp9QErlIF7EyAPcAUeipejqphThrFVVqzE2DbcgXLOXUlDRi/HsroKy0UZzGUlSZ7u8PIH8IcscCiMZncZ3EAhnwuS6vUR+oQU7z/7Q1uqejR3aew10wmDq8HyXP38MxarVeR32ZRWwObQS7bW7cWW1F7CSk56k93R1fEGw2C87D0xijHkCHyZK21xvG2tJipFr3IWBrC7qFfdiKx1KmmTHaQfRCUY9mNJyluAF33ylMMKW5Jy/3MbBcjiCX6M+YIhyFls6cO3JXtSIkIIJ+GY2bqd1Yw/OQJzUNQFRqv2IfHBiUXUDinyRW2tk1C8nk4P1dS1+2Fba03PGsaUt8OfgtP0SjJSlhhXUBd2rEPDQNCUOu3MWVFzRxkrHoLpcUhkQLC9uNr6HK33gNwQGwgjQ/U6+8ffPlz0hgbYCZOWV7eUN4gMJ8lhx6fyNalTkD/DuAocQDUVViBO83/+kp2y7uZsWVuP8LxO118NccWbm0nrPX0SFm44bQaChXp0gnaVHf8kjbZ9G7K/1PIJDB8/BNO6PdmiVMEHP7Rfx25wEniftLpIM6dVkTQ2zJIUdnpDAz1GfQwPnl0hiKAiVGzo9nlySpHuhykPz1lkyE8d/Upsm8i5G8PJIh/4aL1QYxkDEh6OZZ6qSh2Lmn1AF3U3I64qTdJyfPq6WurMyJeVmiEvpyXxJlhqoMDUUHx3duMvGgQNttfqzKIzBO/oSbc81Q4LjhbBF7+Gi0bSBVSmNHOCzCyoACqVyxl8pUlapYbG/Xqje+SoK4OTX4BzLh1G6ck1T+3Z8gSf0WcFJQ4TisscT4mB2rEKzynFNB+AF8ywsxI2z48ccXqUmzn6sEM/DV4NZgtok2p5mrC1Z1yd2+DZAMc5yjzpRsnNAPO1/tFNCBr7q47gzD4ST2qoum47A3C6LA7DFQyuRerDcLN/8b0a7gkfqGYRl+YyaGdcJrDR8c/vInSQhy+3YclU2NQgrDn+QfEdrZUXwLQkfkBUSgxpu+gFC72a58p7moJfjOQMEgFthlxdEenSCgOwXfTK+7emTuUF0nrD/+bRoy+6qfTtOE7+3oLnw45SX/p1OlDCmp5YOP+ZLztBP+TuF67AxwDq35tieMYiL/gbOYDf2SV5JzjRcxToskwYtZnzyMEOe8EuejNIeAYdpJXG4zbY26aPR3ynp X-Microsoft-Antispam-Message-Info: 111HXYHZhimmXAwAIoEqNQ+tFVO84tJKQ80yak/bFIr2Dl6N52ZReS7IpMWEOwe+7HvamTpovmvbu7AiPHK4J1kQfxswkhqkSarX6emXFSxGmPBEoLpf0ArE21D5lWi8oG92GiiCb5w8BYrUHFgCmj+WoEBhYlwafxJPbjKSZA9AgiUCFPTmNQCzWsJUsbYR X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:msM5kxvs9RAR/UrRhMTWOpx9ZFTmgX/tuniEP9C+H2CG3e3N7GqQrVa7GdogtLEiaCcYN/SZyneQyrefquVwTo9WYAWoXYivLsqVEB+eb88u0HV+Z5hC1aDYW4IfVWQYCRWQeNoHYQ8wWU8Hga8ZZICMOgZ0+hdtTYYR4pRAnkvx56y5/Vllol4dBUbmOLskcR+GyZjIug0bCRZtRmWZrWVHcp/QypdDgwLiV4Qa/P4C6ltoN0j6FHsp55dPORks6WCUezo1Mc2ik9PUJoAdZDBIgndcqMaC/U0ljtlqGG1ZpLgLy294zUd8FyC/+PvIsgxPKaLVqhIrkKIPEpwxKr9lXAHLJibMH/fzgezb5H+VqXry0R0lByL87x4ImvMpvSZIgIDvuroVDidhmyUUxJP2qASnkDbUURwxWBjBc+6j6MXGY5J2tLxcSH2kWjasSVmZg2YIHxIihvqqGG1/OQ==; 5:XLhy3UnMvz51AZT0BD+ayosYzbZmD4PwQ1f34haBolsrjqzsLP49JPRC33bhzLVaWNdzygOqaaXAuYdSOvlN7/2vs8X2mWZ4nYFRsVt846lv3a1cMeQTadyKx191PWia/yrR9X54pHC4dtEl3mHJ+LgQbdPUFW/Snuc4X3cTztA=; 24:azgj280m3RUMWcymxhkmRVqIjvk5nL40DRJBM7ioH7wfjLaUd07rC7aZGBO6h1b3BqMjsaiU+5SrBTRs7Vc1DeZ9KK95tSfx4NTbttS1ELU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:zcUKXipq6bBobY/1jAR4q9alalcFt50PBYyoDhLssEn8RnQDqYOFaF/RG69351+7Ax/qKGd1Vd5Ehym49y5TzncllLJDz4VDsRNcSx+6d7QNkwCr2iZ9s5L97PeCAapovdLrO1C7g799giHImRDHWog1po3TIT/+H+Fqb9bvIoFoICsI1e9NqQc8qjHRLxpRd/LO6ztrl5oc8p2sVqy5sj0kUkVO+/BigZcrA1hvxo99ppLvaas/ms0gk/gGO6pL X-MS-Office365-Filtering-Correlation-Id: 15e2b09e-57c0-4523-4c0d-08d5a05abb60 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:48.3943 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 15e2b09e-57c0-4523-4c0d-08d5a05abb60 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_025001_820039_73368A26 X-CRM114-Status: UNSURE ( 9.97 ) 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 [104.47.1.47 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: Benjamin Berg , Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh Note: DFS is assumed to be usable if a country code has been set Signed-off-by: Benjamin Berg Signed-off-by: Peter Oh --- wpa_supplicant/wpa_supplicant.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 9ee099613..9e9d03769 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2033,6 +2033,8 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, struct hostapd_freq_params vht_freq; int chwidth, seg0, seg1; u32 vht_caps = 0; + int dfs_enabled = wpa_s->conf->country[0] && + (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR); freq->freq = ssid->frequency; @@ -2109,8 +2111,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, return; /* Check primary channel flags */ - if (pri_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR)) + if (pri_chan->flag & HOSTAPD_CHAN_DISABLED) return; + if (pri_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + return; #ifdef CONFIG_HT_OVERRIDES if (ssid->disable_ht40) @@ -2136,8 +2141,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, return; /* Check secondary channel flags */ - if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR)) + if (sec_chan->flag & HOSTAPD_CHAN_DISABLED) return; + if (sec_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + return; freq->channel = pri_chan->chan; @@ -2227,8 +2235,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, return; /* Back to HT configuration if channel not usable */ - if (chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR)) + if (chan->flag & HOSTAPD_CHAN_DISABLED) return; + if (chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + return; } chwidth = VHT_CHANWIDTH_80MHZ; @@ -2248,10 +2259,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, if (!chan) continue; - if (chan->flag & (HOSTAPD_CHAN_DISABLED | - HOSTAPD_CHAN_NO_IR | - HOSTAPD_CHAN_RADAR)) + if (chan->flag & HOSTAPD_CHAN_DISABLED) continue; + if (chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + continue; /* Found a suitable second segment for 80+80 */ chwidth = VHT_CHANWIDTH_80P80MHZ; From patchwork Thu Apr 12 09:49:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897593 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="QryD+i2K"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="I7rY8FJi"; 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 40MGRM369fz9s2R for ; Thu, 12 Apr 2018 19:52:31 +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=XB7EDBoI4kK+SGpauwHzLr7NmOD385P15CUKRP/bwIc=; b=QryD+i2KUZcxSh HuOaBr3Ie0SHLDep7dPHvIqkpnydb2cO2vrh4waaHVzpFvtjeuInLu2CO9noNT+PDoxXzj+9laYeU +nGlQAGs4yFq42JP+Uzi5RgvpQkbpUWvUebe7IEE8Y+nQrqIrz9xT9aa3INtcYtYugCzujDoQ3qaM d4UalRwGhF7pMajOBxnXwowddHdKXb/Hc4JywirqV0P3WjrkohFJVGdq04Q3BS1FVOftYBTqPiblq QWBkggv2cGbWP7DtPUS6hJMrceeVSI+717EMKC5s6002tUNVDj+29DpfelWyCyaZ9hw6HdArMb33y NLGsAo0OHfmIt9fHbC0g==; 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 1f6Yu4-0007bi-6Y; Thu, 12 Apr 2018 09:52:28 +0000 Received: from mail-ve1eur01on0047.outbound.protection.outlook.com ([104.47.1.47] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6Yrk-0004Qg-8z for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:50:05 +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=jVr3tmIHo1eK1E6SsU5BWwSCtmDZsbIXCaJkWG2RsUw=; b=I7rY8FJiLXu5vRxM8O1ZxTZwbVf4YKrIaBjrM7ddWD2UYE+Up1WPvHjUY6CF26FhIFEVtn9TKMOKmktFOJhmWjJAbqP26IijKe52uwobsQ3XUcNAnmvTCmp6hxrFB+GO+BGozzVz1EyjOczhiB81J0imH1hy5Xd7gjGlfOdP7/U= 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:49 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 12/15] mesh: allow mesh to send channel switch request Date: Thu, 12 Apr 2018 02:49:09 -0700 Message-Id: <40d5bb6e1502e6c96f51d9f420c672bd52cafea9.1523526306.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:WINmEcCz9kKjuKBjfwMFEPhM9HtfPXDRWWQVClfqAeRAC26XsM7HcGHBoVP5Iem3G55a9EmdMeHsLbOUy2S7H2t5Yg7BmOrBWr+G49YNs+PorPvTlPLN1EdjKz3x9rkdzoo5IzInVnQjMKq2FMt+nUqshrGFCstydESabK7Mg7WmRpDKJXciLX+a+EmPMf7+qcfg0SX3ZsZ4pl94uJQ6IeMUcxDP7+gmL8puiswZHvSlS2nAoXcD9nkksED0ya5n; 25:8CJVaQ84EQ/jKhZKA5SH9xRUvXe8So5NOcXlz8SxGBFfqYi9X1vDfwtj8mSqXMO6UA8qyEalfnx0U+4GBJwvk/xG8LKLRGvstfeuygRPe13NB3IZM2R5DtuqUD0h4unu4Xz8YaOQPvgeF/2MKK6KN/xsnZRfDCQ9UbUBSac0jNgNaDBv7kkMU1y03ZJxhCeWZVVbaYse7KfY48OJIt9yXkyuiP/VDLaHA0EIMoSZtYULHmX7R3Hae4OIzTeE87otdBdBAS1vrELp0VUn8J6he6zmhYGQnVz/1eQwIpPBUlLQ0GTJ5u+lbTTU4iqvG0qECCxqi9eF80fZ0eAzO5at2w==; 31:vYHMS2L5cZCgiT/5oHtYx5XVwRadn3VBVKdaxe0Y55VxsXBhvjeC5tVN9eToHElhDycAuz65//xF23epKqpU7Iq8UXpkTanpmUSic+bOZf3oZELsDiP+u/wVMvBlC2WSZ6Or9K4/t629Eviac0kE3vQHRozHC4w6xTgg3QJfyAJjcj3ZdU13TclkxY0z+tRdc3Ckx05bmmaa6WojH2C6oB4MEG7kXeWGgqAECh9GXgo= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:H2HfCscKCBwzpoCbn+wWiWmxSBL7EX/SJNDQbxOfE5sAOFeiS4oLRo0f2uDPPHrv3+UCNakLy8uQEXe77S6b59u/BPiKPa+E4liVf6stIADfIjKZnnmhb7eVGsaPBenuLOUDEP+1xbm/myY479coUEga6zWi1CMgORBhB8onS0JOkwYB9vQme1woMx5ohgOSweN/aFxuztRfBV0whYv8p/fuRcwnLKv/s8VR50yrTUiB9KfuOeViV+LAHFjh9kfsRk4a3X+cP5F7gNGItErUS/1Y5JDIZbisqBXBt/l1CWsIEZL6YMUzOGjQpwVN+qKK2hNUaAgP4FM8+8wtYhy6sw==; 4:OxJUuPJR7UDvypVcfqGfVak9cIiL0xBJ2ooK3NPXSyuagwhj8f4QmSJ6iyjz+Zhwacb5jBtv4mdEMl/HadL3ctsnxhYEZ/2OgismBH/sug8wKstkVa4906WvMiLF3io9BPz68XuFelQ/WoA1wmDwCja0cb5jVfRGZ0gJHVkeMTRiBb6BGONj+EqWoL8XQPAbz67ymh53zGuGsG2l2P1sMza5AuTxj1HtcYnXFPREUk4PBm2YkS/ai27q9vLW3buijS6WsLZZ4h1Q3TPk/PPrLg== 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)(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)(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)(46800400004)(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:w52El7y7Y8lo8eLmUwSXG0ylr/BnJdhrx4jiYtaFJ?= zjH2obylwQqo0Hc9U+15RSxDkSYGRtXXivW9jwc3wZamFOMYvg0PB0QU3BrxiBQAXwD4miqBAA1OkRDIlZV3O/iY1WRQ+1V+eFTCDucyjDG9ls/KwpQHi69RpNGvYP2eBK7BYi9IHwqPPhpgS63CWE5EtXu4vQlvwWXXboqmbARbw7EbHv2tuXLvM/AfGF04ETJay+jWJVpNa9lWAM79CygKKTp0jO8kyjykF1YjOWTHQcmNJ1l1x6R4oEbxkF1W3YxvKVMHES45vRqw8d6GhBz08J0perylVHM2O1Rbw7fQFHqIEm1W16sDoE6eNCAWb+l8FGIwIkTg9i4ff5ZO0zZOfJ53yW5HI5m/9tps/LXbzgqSlr5oRahMGPOszR85VH3OdNZyZi1bVXp3Zbnzo37PE38yCk36nvDNlIrPFCD0EQ+3bUv3umgMheusKAVBansQDqt2YiQ3rfd+GpR8WGW9ojZwqJzq3t8zOleF4WPNMBYWgRTLGdjmPYp75An6HrEt+D6V9Y8jxJzR/hq1HUgkjnoqcaFCmu4yyRgkh3+GdxOH5J8jizIHWjYdoPz2SP1zyaihNtGF3hXTjh3V43L1ThIq76Nzy+mfrLFs0WU4TioRwEd68HpDC9SwhJ42EDoO4EagSfGHY+UkgzgPSUBNruRbS81Rrf2ZOajWsArsbjIdE9AIqjQRR6Ikbc4beqw9TE7rxt2j5eB0eI7rsb1oGebm5We8vCOoXZHpkF0evHGoK4oSFrGMsfbJrpQSorRiUQ8fNzxpUsokcq0W8VdggJH2LIRLIqxpJ4XQdQ2iR6rbsVlB7krOk85xxxWtXNldlFMl1Mw3EAcCEGAmBL37G3QVzYl2qPnG0Iv0VTI7RxOW+h/XoWTMHg01Q6sEYSqaGYYe3gfErFsrfWfCgB6EZQfIWJ2anriEfofODsIc5HcshZtERXCFKAcX69CZjERd3FVoooM7YPBFFOZ+P/wTn2iNR9OPbrjX+k09P89MGlUY9/9Tx9JCgdrqBzjjL6oFFrE1AmsEIpMd3M5Sjq6or9YRCmd9V+zZT4JOsCZQH7USirJeY4uMrPc4dDqMZOT9lnLX9/IRQnePl2o7Hfx+pR10CGuEu7diU9Ks1ZaYGg77coE/lQokHLiIDM0efWx/egdzLTmVwexfTru83XYOgWW8jHTfn0/0t3Mtif9zeSdNaLpDVu1+FG1cf8aD8ccCQGnnRHx8Rh3zreNzppeLfoc22EbSEBJT4MeyBPoAfD66clOGIPSByc/cIrlQqJL0OA8cbpl4fcuQ+0lAiN31BQkwZuQEQ0R7Zk2UYdVu8PQxz7pqT1uh489+kIGIH+aIGoyefP0a5EleDTgzzTYYszIihZeW+kGY4rDWIO73TjqwSiPgPUKe8c9e/t4lLQ= X-Microsoft-Antispam-Message-Info: p3IZJ/gwUh3EHi7P1NlGZx97EM5gerZDlZ8bY8EZSW0xJjTvPI+Z+5H00HZHVtvaCjJN9uojC891e3p1CtHe9mA+OUDe/y0faV7Ogw1xYC2EGfa8uGN7Pmlylyilorx2dYovBEw8IVIFa1ZUmqzqF7BCkdR1wYiY+BSP/s7jjKvs/x5KcH/W0BvMJydfsfZh X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:62Xwg0wBxfwVVrFyvDzJQ4oHpFxsNGlHofXNz+3F+xZAr43Ac0+MIEdlAgHB2zseBVXikpPEP8flULgiIzze7b+OKcFfEedC6T4rlaQQD/ewgSrhtm8wBJLb2JGnF77nwhzBoIm9sqxec7qBgOlzz9jJWYFBy/XfiLmfdBhlTci+0IJh48AGtOK/hNKtelCPdg/yn91qUmP5GnvY/0rBitqHWdiY93IOUZe3J7cQGCupL5kBhLwMQ31ABtRjNh1jxxJsTXk8gL885pLgZcHKz1qTfZBCZmrKyUH4Y5Z2iYjbntx59KP61es9x37QiHUsY1Euxh0P9dzcMpIG80GCpUQaOgXUtIbdUlsgMoKI8XMsJmvL4k18A5UZGtdY0jFbKfK0ev9m0zTbacov9oYcrThMwwRQhbEKvo/QRQftEiPc/Cfj1pb3QR+2dtSz97rpSmbRI7zgLAi4Ww5RxXvECg==; 5:fHnzIejBmpxutFIy9NveQDLfADj7hKrwA5OalIummK0Hmg9gvqCQuoWKWzsRAUUZoEjt8slJa8PFtNTfFJwEjRgYtXPCerKG8WAO347cGmWSTvg+f6Cwitv4yNuQvkjFapeB7DXGPOv13dBw9J1WlH4nrA+xFmXoFMl686rPac4=; 24:UCqQHOMUs1vw419fdGjJZW5nze8U14NzG9Kz/AyKi1H/Gs4j2p0nCpxWfCQ8CyrJMdTNOt0JWQeWc5pL4N8gviM6bGo1RIv/7UbhorpWq/A= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:ztdAyvPo76nhnclZHFZMLSANH+uQWXIdcrgCiVxOHKvzP1ujF1LFK0WCSt08kII+XguhLmDOIo2kZzzq3nuif3nAkuUW3as1mSitseRDRzE6uABzzppG9iXeOL/xt/K+M7bNi4jWLnKEEmCdKMhaMXt89Bf60LpItzRjWcJsXEGNFqPJ8l0DUWY51R29+tKN2/db7ZWmbTzyqnnQ9J0lCuoQSIETVh4kJTyvJPqvuZo+a/fxv/u9rYOVVCrBaqGv X-MS-Office365-Filtering-Correlation-Id: feca5979-6667-4d4f-468c-08d5a05abc1a X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:49.8163 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: feca5979-6667-4d4f-468c-08d5a05abc1a 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_025004_372454_40C7B152 X-CRM114-Status: UNSURE ( 9.86 ) 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 [104.47.1.47 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 add mesh type to nl80211 channel switch request, so mesh is able to send the request to kernel drivers. Signed-off-by: Peter Oh --- src/drivers/driver_nl80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index d5aa3faf1..73555808b 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -8659,7 +8659,8 @@ static int nl80211_switch_channel(void *priv, struct csa_settings *settings) } if ((drv->nlmode != NL80211_IFTYPE_AP) && - (drv->nlmode != NL80211_IFTYPE_P2P_GO)) + (drv->nlmode != NL80211_IFTYPE_P2P_GO) && + (drv->nlmode != NL80211_IFTYPE_MESH_POINT) ) return -EOPNOTSUPP; /* From patchwork Thu Apr 12 09:49:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897595 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="YkSibTkj"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="TqpOlcIu"; 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 40MGRz1fGsz9s0x for ; Thu, 12 Apr 2018 19:53:03 +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=bu1IEp1QcITJxynURA94jkMsgM3sfmHWH5dZ7n2wM54=; b=YkSibTkjCNj32u v6ik/nBRpv9gki7++elx9lSvSvPUMCP7D+UptYimKqPaCpDZV7Pet/uOClTicuj7wFeVLp7nnlhbm Y+dd6fDCPcHdq/a/0KEX+wGBjifgalpJUNMKBGYf8CdFa8XB8PZ/8Lrrjo0JjweUiM6Tv8qxGjuWL Kw9m3/6Eg+E8GRi5InfgUAvFzmCCHAuGP0LJ9uyL8l7+4E/KvKOT916gTHWb1s2aZbSuJg/hkD9+9 yBX3Ev/dlFxCIvVAHUq+yPsFHPPijSDw0A1q2a1MmJ6WFw81len/wU4gcBPXELCgueU1NTficZTjj RpnWJGa6VOPjf6kBookA==; 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 1f6YuW-0007vd-PJ; Thu, 12 Apr 2018 09:52:56 +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 1f6Yrr-0004UN-U9 for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:50:13 +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=/08EYqKYI6Biur8cUqILDXByf+dpbKHaylD0sh/8Noc=; b=TqpOlcIuaJ2kv2Dm+3ClKS7nTQ7/39oKPUohmjzFMtCAUYEC3MA8y85lG3TcXrcF7rXoqGKUq72YJ8tcc6+GBt6sAHh2P4sx0vTkKRpASXcL1B+704AjAfqWP5+Ll5R/8kyJGyttytBQtxivuh5icm3UmlHiBM9BS9Nql4+Gh4c= 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:51 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 13/15] mesh: do not allow pri/sec channel switch Date: Thu, 12 Apr 2018 02:49:10 -0700 Message-Id: <34bba666c01ae2a4083fd2f9fcc067c7d84ba237.1523526306.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:JhfaHEogR5IQuXLwdDgLnoKUl2EfZVOQ837rJqPOe7SqGV1jrkD3YWwYqwyDaXMoKR/39Cemk1wtG73B3BYQaKyDX9uTfnYVLLGH//e8crvAmhWfcvGhWrdx8esfrYdGc1aQpitpK676u6GWJfoNkBVXb4a0L7DNRXf6HY8BVGyV/qqGhZrhVcqyPi/azibj1GCwSIjIDmIaBd7sBf8WYbGNV9t88yVAmabgGzrxX78m/FnKhsLlmtZbbObOHYrF; 25:UPbzP0lsSupnNdhsn+Jjzi6ZiWnuVOsDAN+Dw+dYTfr9uw0tfvIQSjMFLAelU/Oc/UT/+n4ojcq/FAKrNZu+fpHy/AcE6/TfClaSq/HcdqXGg4fNzcQltErZVChBiK1eq8C9z83XUcbyQ8KbxzE2gWKdRAuMuJ4K1BB/UXX0HYC5cvWkCIqQ8YaR5ESCG/s0SQbzhQ13hGXiTbfk1B3zIz4PuW/HAKkzO6UZXlIJ64ozPbkkm9aHUNUmq0Lb3yQo6Vmvq7YG56Ar46wkDMfbz2XJ72Ewv3WuV+NmbadOpfBtJ5vpTqK2p/72TpE26+2er5rF/m9Z7mByX5s9RQVROQ==; 31:AsrZzvdnfAVj1iSaeZxpjLPwLP1RvUmE1hlSu7xRcoaGKQB+IZaNqi5jIF0C+DCZza8QcC07Yig4fpKs75AeklLSTFjboPGh1KQatAcuCg+HQ1c9IbYMwpjoBvQBwOjVOahE7FmGSx1Ps91XUcUJ3naWIO2YqVMzFMbhqfsCS53GEvl8DH6muUFo4DeO5O9RL6hRTjw8ZMFCwRusAYmoYJFuo+1zjSKPLuTI2n99lHg= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:Nzitbfr6m+tKifo6xX+tKK7PuqYElyuxRwqPYeQ7XkbioixjpeVp+vu5DcOwA50JCuabnN9vxOmHQ187zf6cxjmNvbdu+nUQ8jLdhTmsR5Z4NomTHpGqB7gxXtdCKMAphx0np58thqm9yC0eGDPe+n0da1cuqZLRfLyQFKvUI1I7W5AF28S4EmC8cUUd+Q0CfDSOpqyQC1aeuJsYQpc3QMiyqXemPcuWomIKtHeNiKWuPTMkAh2gRhcHebgvm0Snae7QDDO3oM3tRXGBAkbCrYjj2Z5jSN9KvltRp6jvFQ+iTOm/21Q6f7hy2f4PXzCn/1HG+K/FGEabyBtNMatVRA==; 4:Zr8PWN8BNQLuixh+3w5rq/+MFpA5hBNagteE7Q6qlPqadOPtlnfnMCG4il0aw6rOsqbd8rZN1A1AR7hXy84g/NfGvAkyGM86V06JqCsPNE4RWdL2qPLg7qja2XaZQLq93Y5Q/FpQ1ekt5WNUA8FTOHi4GEFYvQf3lNc4u+MkD6lLcCdmRy+PdklfQ3ksw8H+IECn0ar4NL/deD900Opd00jb/oOgxXM67EWC3hYWdqQ2SI9Rhcgi3Q+fN1c9JKq8FDjuezdUimuVJGO5WFSxJQ== 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)(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)(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:kW7T09VOKkcyDm2aEEpHDHHPCnP2YyBnGBvbc6fwY?= +7Q7N+LYfAa5AAMEXqX7wHN8H9fGu3PMUEJEsMHk6LB9+PTas1wlJdu78iGl2Q3ZlIV97QKGxA71A0LzBXrYiP0AEKjK32zSdEdCW0Gvb8vEWKmk4dX13d/+gnmsNEJlkDWgYgQmWEzKt11Gp/rcXYBV6k6zAAxNIJaVOKCm3H/2f+CgyNIY3x7fMPZApzSgMraxs/HUszcjZnisBFPrb8FQ42HcrqPAZWvhl9UYIErUFoE+GhBwTQKWUGboxte/Fv+F6N7qntfZP2TaQai983KHZHSbMQ9rlw0YhIUvxBA2k5iH/YQ5aENYPqiRC6Ye/hFnHstk5WGaM71yYcRJs9kLs0m56FFQlPM8JgplDZRZg+dxuW/Bk0fxXS60mwlwRnQ/r3OYKM5XDIdnLUVo6wKliqXAH3SWQ86c3TLLftncHAxHFcDxeHE8QDR/RSAEA9H0pIjR4aZdm7s74iNSgr9nijwIAgu/KdDtnHjpCkQxKx6ZvLENT4uipQan9ZkaYgz3hx/W8QCfGEh+IaNVx9Y0/2jmzLnBG+99M6pxWuJC9wQgaYz20DLqpZG8M9ahq2UYtdqxY+2q13Yfwxy1oZ0YRckvR/O8TFTj7wtt26FKktEATu0aZteuSXKOW6ICIL4iD3VR9pF2rG3N6nvnJ79cyd93adCrEOTbRmyOR/aR/hiHXBWgCAAnkMWR3RuLkcmW0KuOzqzMez9z7LBnmZ3aAdVmDs3CHpNI3YPxUZMukCWAi2xWOS184jBwJHD3lTdg/odWZl3BaCW6Bfz8h4fYqgVHr/500pd1P165NgvPFoVK79ZbrnWXU/kyGp6SuTaxVwbXK7Kw5oPUemF0/hRCKIOTUvfwMH63Z9GUkwdf9UnFvfAnxmnd992PxKiIes0D1pV6gylcmA6PuhR4YVLuc0hQLdt8CUVow3Vy9bH6U2+HQOLLqiihv0sGk6SvKECCgXQxclswzkUzc94n14RBe/BVw8sev23neWWodvqyFzRhPRcGQ5MlzRLsxlzgHAiWYCWwvx19oyqPgbcpRQmIuBU/i4wpH7AvDkm44UdOAtM5xAdHaZVqNvZNXMUGcK9No0+tpFYvGaiGBSP83eC55zzWmLfoLjp9Xq4ihFMLShLpGAWyA9wSOSP1kRO8KLhQOEKqGUN7WnRvnzJm/8R8kxH7RPX7XvrmXBY1JO7CmJ4NsMFVKZrkrCGt+zn3TEiB2uaOmFDdGXhS2tK+26xKClfBpyAW6/orGnoi9XKkMUGpDmAyzgw37O4B2XJo9Ik6IeBNqTfIB8REx8L8KY4VFiHCkEhYis1go4b1PqiciKk1nwqJD7vcFJ7MDD1HsenBtBftJQeH5q79w3ru9JQmsCPzLvDYgqLcCyLU/UlAw== X-Microsoft-Antispam-Message-Info: F4QG1jp9rKWparlgJPls8V/zuQA6ILHc0dNDj3J+Xc1hGViAGerMFASlvVQ2sGteUzuPM1wERfT8/tqietERHIdRceh8dDUO5pjtfKGxsoM/2EUa8K57MNjOXfjNDsPkkk5A1OkSR7oZn42DeHnrb01deAhAPi1iAG01Z3W05oKEH94CxfPypNh/SIxOxEc6 X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:q0l/2ccAyVURUUOoQEPBJZdYzp0CQIEzhzDxH8k/5iht0/Pr/8BBkfLpqHIIxYv2kuc5JtrAcCzAU5P4LNX+qL/Eg7ZSKDLFX91ELvvSVIs5/8868kyICc+y4bPc2Og0e+MEsahVLouTjeOw2rZmgsZtWuSbao15qLS/Elh9iPlh+f3aHdWcON1BX6qbeNQrVEfQvj2apAL7aWEphhiLm/S+aSDsIJPjIRWtQuzIiGTxqTBVR0D135vWmICdnt2U3Xbh/ltZ50OWnML1tZCxHGDPBhM7/Ik7U8d98WzOu8G7N80Qoz4vgmVnBtYUXzTpfNGaciGIFrk/M61lzSZXgSB8j7xgZRZeRCG+x4sXmY28QVHfRmyv3SLtzmV+c0ZQNliBwRMjFOBhYNUAtm8jGQxoAV6sjDYsSlq1idm7gzjYh2Qai0dWSpiJwl2slb1iU6Ig8e7n4k8e8tYzryT5cA==; 5:4bLzkA4HW4lncrZiTYVcm3Vr9SskXWQqXva7TLIDMrFXmk8WgYm7GnOLTolrVuorFrvANbdQh2spm/IxlKhZZH6aPy2aMrew1ywcX4VY1d8y1wvEIIPBjqCrQx5X2rV6WZLm2JVJUl+6KhL6+7Zu4PH9sK8NhRb7eBM/DT7rYz4=; 24:U7Owcumgt7jmg4W8dTP7cPfEtAygyLH2bUXEbH3RZok1vgEvjGnAtrTCQE5G0zEnEYFkBHqu0501ke+B4Sk74o26tVS54V3c7+9fHUzAn2k= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:v5tv7ZcV9q8SY8Rh1VrBXuGw76TZy2FQ/ZnuLz+91xSxeqovf5xk0MBMyrTKzHyXHJyDLjnQVK+n3OwUY2fvwuzWmRYOBh9oxqFGzyIEOlpm9E9qji72xe5So4XgethL1doy8Dacx9AGS6UN8Va0ajdeXjw7Yid6fHk/lwSMyoVWEZn/6kmjqh8aM1LCr+FzegA/VHijmLdyfb3DezLQd0Nl9AKTwwCNoiA5bZOFqOp8TmxIAG+krrR0ia1oGIy/ X-MS-Office365-Filtering-Correlation-Id: adf468a4-9ae7-4dc6-7b5e-08d5a05abcee X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:51.2070 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: adf468a4-9ae7-4dc6-7b5e-08d5a05abcee 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_025012_015618_1F89F221 X-CRM114-Status: GOOD ( 10.48 ) 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: 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 We don't want mesh to switch the channel from primary to secondary, since mesh points are not able to join each other in that case. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 9b313627f..22dec4822 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -333,7 +333,10 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, rate_len * sizeof(int)); conf->basic_rates[rate_len] = -1; } - + /* Do not allow primary/secondary channel switch in mesh mode, + * since mesh is not able to establish a physical link for it + */ + conf->no_pri_sec_switch = 1; wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); if (wpa_drv_init_mesh(wpa_s)) { From patchwork Thu Apr 12 09:49:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897596 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="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 ; 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: References: 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: 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: 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); From patchwork Thu Apr 12 09:49:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 897597 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="B9S4RDxK"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="WcvBDDcp"; 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 40MGSf2RBTz9s0x for ; Thu, 12 Apr 2018 19:53:38 +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=wZnwuj10diMcjEukj/eirOhXhNz2GZE6QRkt9yyopvI=; b=B9S4RDxK1BnCS7 F0vE+aVoTdACypcFL3Tig5AKhCMacMVALFJQ1Rh2jI92UO8AnbPFVMa5QCKEYwDAg0SOb4H30bxdC q6P11VqUUzS8q2Sdu2bJwW1/saB6DcH8bWzSDDgis2LZqj1HKaoWVN+ThjIuwq8X1bf6naN+adRy6 KTK1pkn7CzNRM0jE543IwJd3Gp1lUpOBoeXJtwYApXacFTIoIAXHxs9StN6sZAkJSErCKfY4OTmKe 33fPl1euLqecbQC7o7FvdmLl1+Jw4PZcWDa3BgpoXgg/lpjDJU3Gl2WprqUD3hdrNc53h6rwFElI8 YromSd/FLpbEfvInRI7A==; 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 1f6Yv7-0008Kc-2P; Thu, 12 Apr 2018 09:53:33 +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 1f6Yrw-0004UN-98 for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:50: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; bh=4G26civdHiHirwVNlrxn1FtCbf9VeUuMJtM0R3mLUYE=; b=WcvBDDcpc/yqaPfo7QvSqDytadPtXPhLRjoYmc7zV92A+KtCsoSRT1TI2RgCvwl8J+rPu6jP8zgRUFHe5xfKj0SBhQ5CBFxnBxClxqfXECclKHpXlJMHYgNrWvleY7Hv5BJUxQratozLIxSej4iJmi33vHDNNDyUt7BdSoHjNk4= 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:54 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 15/15] mesh: do not use offchan mgmt tx on DFS Date: Thu, 12 Apr 2018 02:49:12 -0700 Message-Id: <5aa099881bd0ea5e203b42fb6f64226f836d7353.1523526306.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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:cpJEG3NqrWL2U3rOMDl5suOFjvVkd3TG8eddi4/Lm3jTzx+PAAEbmAu84EGb8gvlBwwuwbj8tfIuAbPVJYHlb/GR0nQA/nkhUoieiovCXx57ytzG8abMo40g4C+TsG6RDUzEwJFmIqVIUYQkP+VyJi1PQoC9boxAv4ZbMCL5t0ArIM4wNu2wwLFGKTIRivNwEhLESWw4J/QkeZq3Q+ghKQAUio7w3vSptTzpGLqCKmeHSCymIgZmvb//S4omOS+a; 25:Zb42zqXU2wikdqviFfsc/jvPkfu1Hone27/sclRWhiBKDpkRHMBkLCXC1mOZUIyGjiPSI2iqNGslhliduLTebgj7m2JBd5x6DZeeMNd87a/7hc86oIKr2UAxWsbdpte30bT5RB/n65aX5yys2SNDFrmEs6+MH47rdR3cbPkndt68TWgRwGpMR2sAbFHU2pZJQ+bdT54FSLwrN4/mIDqDYwqfaqVCQnMQHAf7RdsMmAIr316dPGIcaJ4LbLbnFWx9I5Y73pRIzPU81uFbHHFkOLsMbsHf7u7g7daeRelJzNIaWKA/bJ+GCd3QWCIS+9tPvBzok3VteeK1i2NW2M+Bzw==; 31:+Wlfnw4KnVG1jL8Of8XxhsvabHIOejEFKffxRpmBvBf0VOc1kemOh7jlge38lXtW7t0hU+HQfzIUo6Yyx1DAny2EG8i8+4F9REmuZtU7kubPoAMxkxqDj6AQi5gxunXuNgkiFSX55KJ2xUDp30fEZ2juDF3/9bT4BLM3Zpbhp6QvwWxlLVW2lAG8bWBfiyfQ6CEug8VPbo8eEG4lpwOquxKO8U4/IzC1qakdKQFdVQE= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:7RhFH2S5m89hJX9rpBmfb0f6UHtFnF/PSN5abQ8OIuxl/UGGTOQiqSuGqXtMwZZgR1lq12E05/TYDXNr0oUUEnIpLaHBgdsSyEWzFWBdYRcyKOTPhepuyDefiNx80iqjW7PxfezbtMnBRB/QeiRCIA0nOgIl19VsyEmRrkVJOvwFDwU7IEeFR7z7D2Y2326Qh3tOYVi9zddwkT0EFoz/qWct0qojEFSkaPphp/mBlsr9RcRpPxZa5TYDNkd7q5AGu/BwIcORGK9MApJsB5yBJxtYTb4evB1wRdkp5IJVrcjvUUWmpWWvFgvnzFDkf9ipNuqvngHPf2GqUSNe/Sw5bQ==; 4:5NlXJCnIl5e6NSbf581jNRk+q9OAwspnnVPw1rc/waLM7aRncH3hsZXsBacIiG1nDiHhL1WyqHpNNs46+IK6dQm8ABehjfQq23fUWzl05t3MwFBBZhoCAK7F3tEWhx03JhvRxR/okiQ0ieKmw8f8v8PP4uA2GOOtwmqd+JDMVX7ytcwmfY4e7WzNWHJCROrjo7Dyd2UDqDBG5JoxR8IqvIavCcDe840FUr8YCYT19Q4TcEaswMjpapWOSWVRAB95jZdywmNYVhqyH/H0chN3ZA== 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)(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)(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:WH9NUKORB/7Cfx9xT40/me9tP580O5FQ68UW8RVY4?= u8qcegYvO0jPZGGg+5dUw0340CpmgqT41P2+xMfFYiecLNSZFR/7BQX1No0Aj6g/3smRbi2WP9HJ8nuysOxiCkHbVa6iye+vVUyUhsSglrdzk65LheJqGL26odIN7hldG7bn7bjQxG+npm/5M8qRCQMSZRQXbYN7n9hiV1LIR8FWHEXQM0ac4fKBgxJ53F3IIWNUlMtu2kae47z4eZdG/M3f6Ql6hWkwb6zI+QyycoU3CeYczXINFN3Dm0iuMWskgCr6ahR/R3VjfbEyOtz86IFm4xmWlwHA+OiBdqZMdsHUSeZWk46el/CermioZdoCzo0v/TSSAL1l4ucm+ObFw3k9QJm23HLIzdyu1Dg+HX/NX8CETz7kw0TYPp/E9F6J9qyxPs1T1u+Yg6KSy7/0GLnO4iPst06qg+b4WXyz9fR51MeuwpGbJDqJCnhz8MBOKbku21hRntqDrGLwWEpLi48iFIMaA3cfcXbj5c8gFu+TxUQVhjlPiIYBQPV1+j1uhGsTbEmjrdV6KGVaieRZ6JBPZbAIIab+jSAhovI8dgkdbv6+G6s8CHLdRye71m2MaBvud3xQ2uNO4lF+xrR8SNg/n/ZnA++vh6hUSviVo4c7FgfjuyLeTJUmRZ6eRmsb38m5WtJ+EUA/3kcFMd7f48eOBJaJIEaye8p6ZhHx1J6uRsSrNNRSrdaP1UWMEW8dkd/27ygMeQnBVOw6zi6N4dtE0P6lJgL2TkDDQPrVRHgVLwZi6RGyujhiXFGrzcFS2CjefnNJZKiuGWrM72CrYZrpjB3GP3PNAiYDOaPIVE8EQHCYS38fZ0W0czYh1CVDVdwc+XuzlsDakNwrB9q23co2sNryxWhbGz/JY8aDenW6X29RQXlLxBZ6Qtb4S/ndgweC2pculNOqlp8ipgDoJtnBCOg9MNorpW1jZD/oFxpDcQjJldjyQtckiWlYGPydd6vVKbuWBH3sp3AhbuhZAI5KnLJ97QQLlcJll/rRS549XkiIFjS6hzoBa/RTp6z1lawSfzop5rUxXq26cjUKUJ3K644bgEL8ULZvtdgMEZLMQZteTK7fxr3mgTD9bNeU9xmt9UoJD0J/seoWS2nUe/UoJvnlP6LLhUJBpEb+Yt7Wt358rjD0nWN3i5kHQMe/55ixVudVvh8YUESO6FStDQEUmIXmeM5G+3j0ltDWFuCF14EkPV+5sm+TLHxp2pCGQuOyVXpZQlqE0zUwZw4mKqs2pkqGlnJmQh4aQ5UFaqGUWUkr81SmjW1fciOra44s3xKI0kD2GQn9+6+XuUu2vBjXLMIXfbR4z6lBG93aHZHm6oVwDKJZCEFCcEKHBnj15Hl8yLO4AC12qA5pbPXezHisZwU0z6mE0hTZiS8NVuFbA== X-Microsoft-Antispam-Message-Info: 7kf+UNKVYZBeRp9BiFBkb91CT6N/kiIJttB+qPI0M2fcgBS7hxjbZ3CWQHBpLdI0SmRwK3wj0qvNBjdnPUwWNobIApWnX57K8MHyjLjHo6+YVt2P6DBsCyo7/EPOledRlDdURjzfK3SLpLNO/FfpPAG+10PSyPk+jKhlJrQSUKTR8fC0KUM+8abSnpg4Jaud X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:Fh/YV9noXfwGSpXwCH/rMShKXLyeaTYB2ifZ5uHQKgQEKATmyZa1LTNumz+UUUse4uvAYiWl1cx6IvzjojMlES/lmcJw1ZrVHa45P1XPo3z3luXeZOpHHIoWC7WkdJoZCblWzdFnaXuhPTgOlcOOZufFTg7mPll2HpY2ItkDgxe4H0+OusCyBGh4xZgHjjuHmwDLdtVXV2lYGVbJ54gdcnuZlyWjkuiaHBElGzqqvl+gXehz339WN39ySjWJO96oTlZdq3SovdfFj6OubG927oogmesQ9jvECSujvfVGlV5ZCi9TPV6EUye3X0nHKosUE8uulwTVYLm8AB/bBqHKo1y/uwyW0kWw4az1cp1YN7AdkUa0O59aDhsB+qNNUGEbVPY+7wJEssZZmFOz55TLtT/+XeZB3SeaEo0/dfgXg6tCzRhoqlZQenLtSA3ACz1nkFHseZa4cYxhghPFISEprg==; 5:/Q1/tJxI8LRpQCxQJ9V93+j/qhDQfxG8UWaDCwk6XUrRDg18mNwcU3BH+ExRRr9IzLXoGReBCldwKDZ5FIAxIDVdye4pa5iUdew5ws0QaLCk7jl/IuAeyvBwSwbhEO2njt++pydzSSDZgCFDHl4Fz5YNIyb349777pqc9Qxc/Io=; 24:s4eJMgfBiFv0a5+01A0M/jUuRVKiB/p50SXdQR42XuRHo5UzVJbly5pgCrfp57bRPQ3nkermj58zX4AkmZeuuXc3UfUkUKj8bUBkjRhBu/8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:Ru9hxjhczlpzT0EjOiwsJzGjhc31n8Ln0CIAot6VPgbc9rvYQEr3H7MtPSxleM73A58FunhVQfNBhJcxxdGe3OB4F9ee+wOLcUr8gkJ8SI1Y4MABFlchXrAfeWZsOjeC2+Qmc2BVuH9PVA4AeEqLoyfPdEuu+2s0oqsZe5QsGRsKHY32iNYs7jc9TqHcmSLrDH06q2Ffjm5HjYZIKzFyTkbh+bXFool0p8DI4vxaZXY+DNjJCznydKZcDGbOpETn X-MS-Office365-Filtering-Correlation-Id: 133fbc4f-9081-496e-f55f-08d5a05abf06 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:54.7229 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 133fbc4f-9081-496e-f55f-08d5a05abf06 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_025016_337397_2AFEA9E7 X-CRM114-Status: GOOD ( 10.05 ) 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: 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 Drivers don't allow mesh to use offchannel on management Tx. Signed-off-by: Peter Oh --- src/drivers/driver_nl80211.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 73555808b..e9cb4ae2f 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -7148,6 +7148,7 @@ static int wpa_driver_nl80211_send_action(struct i802_bss *bss, struct wpa_driver_nl80211_data *drv = bss->drv; int ret = -1; u8 *buf; + int offchanok = 1; struct ieee80211_hdr *hdr; wpa_printf(MSG_DEBUG, "nl80211: Send Action frame (ifindex=%d, " @@ -7173,6 +7174,8 @@ static int wpa_driver_nl80211_send_action(struct i802_bss *bss, os_memset(bss->rand_addr, 0, ETH_ALEN); } + if (is_mesh_interface(drv->nlmode) && ieee80211_is_dfs(freq)) + offchanok = 0; if (is_ap_interface(drv->nlmode) && (!(drv->capa.flags & WPA_DRIVER_FLAGS_OFFCHANNEL_TX) || (int) freq == bss->freq || drv->device_ap_sme || @@ -7184,7 +7187,7 @@ static int wpa_driver_nl80211_send_action(struct i802_bss *bss, ret = nl80211_send_frame_cmd(bss, freq, wait_time, buf, 24 + data_len, &drv->send_action_cookie, - no_cck, 0, 1, NULL, 0); + no_cck, 0, offchanok, NULL, 0); os_free(buf); return ret;