From patchwork Wed Apr 18 04:54: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: 899886 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="OWeDSt8v"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="Y6nmCNGJ"; 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 40Qqb928L3z9rxp for ; Wed, 18 Apr 2018 14:56:37 +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=CpmmInLABJaY1u00GzxYZt/tiuBjosc9ooVppns2WU4=; b=OWeDSt8vHpgm5E 6pwUiiXMYAsjZ3omWKFypUPRUZpJpEHha9JfqZZ3f4wIZbNWrWDGwBDik2FYo7izOalzV+lAUwxDE gZQiTUcqyXZnE1sBkmuHSChySvMRWdxYmzWzmLb89H9ha3E/YkyDMV+8WzO+cFIB8UyLT6FjyMUZR Wy+w/wc2zwSAV+PZTdvGNBuYQ4Ef3IUuCJ80po+SvaY1OV0J8qfMgss8/yu5hsRpuHFCERi0sNcev guDLGKjCyVLNARx7u0RjTdJV7xQVf93cGHGXBcrHY437s+SRRx+niTTAnIy71CkxR/AuoKanPLBT5 bSqtBf/FNYvwfP6e0Dqg==; 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 1f8f8v-0003RC-RI; Wed, 18 Apr 2018 04:56:29 +0000 Received: from mail-he1eur01on0067.outbound.protection.outlook.com ([104.47.0.67] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8F-00036K-5l for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:55:49 +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=6ToRLTA8Ae+Ym3oHVix8y4wXHy7ju1Ke6uBLsIcqnXw=; b=Y6nmCNGJDZxOc55a03QffucMOBoacLHUjPKhF4MPnTh4AwDvgOojn7T2soiDTn/uwXmGKLg5GmBh30HGa+6tilNVrFBBmsxGmO7tXfXbLEoqkx/vzuvr9iEtcvEm9kC+7llqRpQJEchsLG8BGresAFXKwufMm+xF7sY9rt5ETGI= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:27 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 01/15] mesh: factor out mesh join function Date: Tue, 17 Apr 2018 21:54:58 -0700 Message-Id: <7ab9ce7949e01a819570dcaa9690b0a88dc12637.1524027184.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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:s1dWbpNTtfLml0aHOL8KkA0fiK+KAikmK0cqkw2fvcIVImiERI/6tXD/e5F6NsRmMt+mT14FdPg4EWe/iQAvetwExsxnpwGiSaeh3qvDd19F7OFoiioBgx7eEFGW+KEP5rWbvDydabuux7gOVLkfNur1ozLE0i2DVuSGTMovnXawUANmunrNL7wkK0Fz5ssby19gF5wqcz6Bw2daiJBeY8Nknb46z06/lLcBSXsWX+g7IlZHhradpsswRYqTzWIg; 25:iVSyLMkWqBQoQc8RD78tklN6tFRUY6KIVB3T3pUJW+PRpXVWVmZ72+8lubB0yd/FEMMhTcMnQkWPC2kznnrCAfPEqepysLei1N3ubIMmyuPnq8x3D5SFqiXLT+Av2UIJ4xQAjpwtHxj6UFUJ8s3zAWepgEXQHqEJX+YxMF5dFIBlQYzfCBbTwFTNH5i6j4wqxwij76e1gZMqQCtjP1qPF3FrFME4U8fAXKjjQeLORNxGTD0bJ06T3wMZK7S0gFD5VlF21s6N4+dxC0rMzeGsFGF49NvMTs/x+2HFJ5Ijz4RcLhpGCcCLAEOq1wVoRCdi2NAJQvU5cbino8a7uRrbJg==; 31:kbQab0jlOYRECSLVGbz1961PlFpCsLRR2YJIkymoFrBS28uAEEK8L4uCxiFi2V8+LfOWolTvZJd/XybhuhjnSXg+6uvR+fFVItFVGOLGfQ4E/yzZ1UDwl+WNUAIlxureUf0KQTXA3mA2gxLhiKq4J/jfm2LsCTspme0yU//mMBn34g9c1mn1fR0ckQQlje7SN9vGyiQXX+eKfw4oG1P35RAYlwjCiw9go4w8wznqWfU= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:+kbcKwqkldzjnq/FfoyKisucVFKDlzzqMz1aymmabIIK7C6uSp9iE33gIgzjSf/Z2EZK6HPS9gLY9+NuQc5h1s1u1RNnXlRDPJiH09UiiRwFVjKQRQxS05fPWi9/YV32jGUBsGr3EpaF8ZJC+Fsx2TBlGuHWSzPIkk+ywfqA7FraXG94IBQWCaiMbVZkkkRhffvHhXYYEKCSg6XzzmesmrGBBsJDoLkuDA9kxwiiCPGRVmT4KiQbfigaZTahgA6nfICLwy+HJm44TzNBvduh/1/4O3RF0akN4ofCr+mBFjpIQQvtuMnNWxX2aRGsBgx8MEemRVLyH2FcEFKeeb54uw==; 4:WA20+qk3Gm9J3esz7vfWRVf/6YnHoRvlkRnt6O0aU6c4IXr14t4iBTR2ruMsT1zxnwGp0PMmmcPPbJP/sh5R52g4RL+JUgyFJ1P44n0TB1Tf9+HBBQrkmHG5AvrhSVMrPLvFOl8aXDr2ZEem55nSwRZbVIa9Qu5y9O+wD6Ew9xFqfKMEsHMXmhrBigb7+QjDEC3iwzYcPfrpU7BXYkh56x/4St4Xoiy5uxY8WfD8Kn4e7XZtWfhZOQTGPy0E0A84jM/45lJovGCs0cEmimWPcA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:DVNSCQ7o97PWhy6plCygRo430KBLWzca5QXtyatzq?= G5eBXs/DYidKDhxAh9k4Tx8yRgVCyFzjzjQvHC/7PArcH3GF4K75lNchnpCgo4bt68ToxrZLCH9lxA9noDr2SeQsCHQR9OeRX6mpkt6c4FtYg4q2X7uHo945OFw5gTBd1tVMocL+0R2fz9Ix4HvdOoWSVv82JfyCbV5JDiK+GfalsQTJn71rrt8R6fdbjA/89Ww2Lgqpy9zrWuYcGw7ovxUXUxBSqCVBTPYanjEBYLkvzsBRMcNpsjov8Puq0huAIQiJVR2XDz2n9ro63gWODreqKp9jDPk2dachDdieT5M0X1Jy9fiMDJJQyxbce6hhQKBdDA2PScYJbl/8JVj8ADzKG4TAc7K/wWxw5XtGHQHoHdpr/YGW/MAUkQaKskKiTj09r1MgyJMFkuN3tOabK/D/umVugCWmRkboM7vZh+m3FKcRDSmxj7ECtDDYNFpvfwj3/CC3OKA+jmb/qzLSJptB1XWRzHa3iJpFUCQPIHRhxYu4EjAuQjyrZjpXkXZdRgcMYQRCFonrGeKflb8R/76mvKyK2+IDbdXIn6Aejf/RH3dX9ClJjRru/Yv0wQj8TDpFT3HquaBrT8ADLBaIffB8eP1YB5aT1E1rYUXCC19doeSHwGx4M8TPd17kmV0UVdDaLULfWxmQGjU8IH4V1LZU1tolwOgCzOJj2vvDPUgj1qEwOLrATZms6ai4+O3LXBX+VtUehcz9sFFiI5AAteudvnmEKlMEy1IoP3FvMSNWMjiFvRVanYc4gr3UZzg97e9n+rV1gBAO0i4ZtivHF3CyOU7HliqhNDmTqpdM5lKOu9/4Jo5sxJtdm0RvROX2TfS40OPCPOs9B8Vqubm2+oJ3vkNENFyoErbUszStPhrMJWNny31eIMVo91akpjdJgWXPU05/1zBEr1aMhAbRTdUYfbPdN92tP9DvnAlcPioopcWnqNCj88m+9OPxGcx7Q1XF//aV+avsSI+21vbr05Fr9lNOU2GqzRgnexE/4bFZCiv3qBCmRk/yANlRDMWvEY= X-Microsoft-Antispam-Message-Info: nUl/UM+TTofEUtVILCOPFhuWc/lRrkbgzVUvNktVKiiWGWvZsN+4uefjnIroO0e2e6ABr+rzr/uMVzPZScxvLsOEkGQwfUcZ6blk4CCHKGFHpQoKPJJu8WLJQMrO/SG5lzonCycX4pRx2tOuzQT2Ifx/qk921l7TdAXqvSKzSTYodUaFIFbPV+MYTGOv0GGL X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:pI3Jt21fbN4kmJgoHf/S9yLCkbl1tDllPq2w/uAUUi/N7rFkyh5Kk+ImhPihL4pDTYIxIqwzOqz4bC2RuIm8R5cdIxo92A8Zn4dS010bc70l62BisCZ4zje9wBV/MgQUiv0wTBj/Bh9W0lUIOdRyZODm4sgaxGaJb3zFLMUkNbflFFC1rwTwTRx6FHNnqGgA4n8be7mrVF/+onpM0RZfCl/kGjrfxti+6m0LHXwGkiaMwi8Wo7KRpExMSn8jCdCh+esPvS7gD9JSmdb5UNVjbVYKDpsuSc57+m72aS9jOADxVaeSytFrqoNKj3/ktA9cBrQUcrJnwnRVK9vxEMY7UaX+cfClR1S0CVb0ULmrU9bjPIQnOtV2FDH67QpqR1bj5yEfO4z1NMxEHnyBSt3ENSSQRgZ0CQlqAriOm5baR/Q2bkoi5IZ3roRMJjLr5QBjjyeunQmGoL+VhB0IVmrDkg==; 5:9dHI3txy6mMf/0ACu+2lN2mmG6nXrpDexTgd/Y2/W1QqYBEBIrKSxOmM+uMsavlTP18mfnb89qK6+ww5GZzpi9LHayVTj7u4HVeY9XBPZwv8JoJCHrqkS6hHpinWs/TdLNXGqmppL6NOrAXazMht5WIKaIeKtZ1F4dx7imUl34o=; 24:rpMRofOICSgysaJVtAE737WOi5+xLJrQsXsSb0pqlN4QtZvb+ABkIHFtiX86G2b1rSJfonHCK+PsgetTQaI0uvBa3bMTtkNsGWXvMBYL91Q= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:cNVYbpeFJQj3+yXd4IbwHruRAdW4QTONA9n51txziIYGVkiJuPsLQ/h6gk9Zs1LSzd6JMTz6vsal3KOCL8XAcNRaqzmUDCW4BB3prmD5fReI76TPNb7U1feMUWAN+JNtHVO8Xg5AHPcLR+bxmiXmzECLgdY/nH3fwEE33xRs5/blAwFUQpstm9tXwrbehYUz+Zu6VZnv26eqMqYCAYH0j9OEto7JrCh8H3L/sjr+Uy6IXesgKO4GhHyycDI5749m X-MS-Office365-Filtering-Correlation-Id: b538b003-fe95-41c5-ffd2-08d5a4e89acb X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:27.2502 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b538b003-fe95-41c5-ffd2-08d5a4e89acb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215547_431305_93BF112A X-CRM114-Status: GOOD ( 14.75 ) 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.0.67 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 | 119 +++++++++++++++++++++----------------- wpa_supplicant/mesh.h | 1 + wpa_supplicant/wpa_supplicant_i.h | 1 + 3 files changed, 67 insertions(+), 54 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 19b66b4..3f3461f 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -363,13 +363,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; } @@ -380,22 +415,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; } @@ -409,67 +444,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 7317083..2e2f3cf 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 4d18177..c023ad2 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 Wed Apr 18 04:54: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: 899896 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="FD/3OtVH"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="mdd6PkUm"; 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 40QqgX0zkJz9rxp for ; Wed, 18 Apr 2018 15:00:24 +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=lNcxoE/scMWA9b/0PS85Xrv9zItynIFkzNf5CrXnK7g=; b=FD/3OtVH1VLYG3 er4TliRWyhsGj9ITnBiWyzp65rJ7u4IaByvVfwekePqTtuIlzQ3wS6jT5MZXUp6Tibt41PxzhmZHI FetgXX8NRKtgieBuYiDUmqRN/DZySuM9jo50aGNSe/FaY96KYq25OxXLNiPq50HGLS3u+Dr22tDnS OUobpdixD3XcuZ/gjBLSZUqSifVX2tl/h0gCTe/YvuzrPW0KBAbAVuLiLUMfmIX0ZP/s2lGX7gG56 G7pwxjIKJh90n0XLr+P4VSzABnhhGB8A2n+ZEmGo5I4ixU8Riu5tGpbmN+GX+r2A6qHEtvXwh9WLD kjVbPY34ujjRaHOJGtcA==; 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 1f8fCa-0006IQ-Kb; Wed, 18 Apr 2018 05:00:16 +0000 Received: from mail-am5eur03on061a.outbound.protection.outlook.com ([2a01:111:f400:fe08::61a] helo=EUR03-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8P-00037A-9e for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:56:00 +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=IK7/Q/UlwqSatux6pkp21BV9z7AkRyuomp0USJ4dTb0=; b=mdd6PkUmow0AIhmYmdM7e0WJalQSLIkoifwrwNkkVC8T9qdziP9KEBNnZySTTXNqVDRBzb8bQDv77MUKAsB3tBkCJASo2xwBo1LuGacYG1Z/sqCdldEXGIy1THusMozODi8yRNSgGiE63lRypdGlWO4zza+pL2+YthQbTXuAxts= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:28 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 02/15] mesh: factor out rsn initialization Date: Tue, 17 Apr 2018 21:54:59 -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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:/85UOrfXAQ/3pBBRN5z4UQ4vdw1/wYqtWhyBHcGu+Cot8iHRQDLuZFyh1lqWm3wuQJ2WvQvSX4dF91+P7DPcL+FtyzWDOHUO6AOXo+PB4YYS0iqV8pWD68cRa1z/8En6t+D7GlwbkS6ykpMFNoFxgo1IkxKNVxIyzX6z2q9TBRL2+mX9xwJDVHpaHQcxhuvUVamCqnVJPwuPq+NzwkAoRGBrTk1FajHgZ4sEG8BYsk6bLtAAbh06QYs8ZHi58GFo; 25:wGagU1NfMAzXSfPQpYZdrrsdwrdD+ULgTA9eTFAH105r/dQUsGZW6QkeuslY5ZN4AzPqiK+wgvbZz5J90t3NBVXkcvKpRR3L9e5i2U+P/b9kvo2hhno2jDFJp+eehhTgTxdKcQ6WVkJlWp6Mx2/mOX4tUMiZUh3Io51tD0iwVUfq8oW1+Lz3ZUlFFz1yXnfA5gFS2zZasKImMTUYBmz6nkGPTRj3ZkEqmd92VmoMt3wTlFRjEuIMGzdN/1yPBOj4vgjXm5Js8iHY0nQLuSTLXFDKx8CPvLc7ehM6COEZNt3bqwKqN9oGtUUOG8cYMNV7LgvNPV3BSr2q7ohqGbAiJA==; 31:8w401xJnWqXqyJsLklZrBtsJnpKm6eZ0osRrc5DdW1x3QuYIJygwG//09zCT1Fu7N4O+NDO7ZekBUMxgaXTSP0wxbN6Rf0n1250IMovuOT/zjwXSQLnObiv4y988nvStx2PbLbnIhFPfybfR3tujP/ktt7raeApPNZUv2BWROazONHFmYuy8pB52QhePT3TEjL9+oYkAPmDpt27vvlFZ2Rw4JWg392K+EX8v8tHdHt4= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:KVBWgP44a1rPHe64vvBuCYJ4Ag+IMvLTgTzNdHl9HNTNGGF8xJ7Nkx+A2obE812zYMpElUAqNtG3NZUqHLVw/CZXZQAtIRioE/8qDWFfjzJtcpQ94I4FGGOdCCDSSNTexstMR6v1g6bAg2NB9HuyoCCYonIJOGbjEIaQg2yFitbCdFe2QAm0YWsXnyljS2p9XMqZtdKQqxMgEWJopyS7nhG1xzy3ioAj+LdC/NxX+vkpnKz/S8/fsUD8wpA0FKr/gjfB4VlP/ehzhP7C6WKokqpowTf7sVR3oPNaYDDzNMP8+N+J8Utq1zzEMnfdN9sm1khgoGNstFeDvRbC8pY9kA==; 4:ADEq5P7XPyluO8t24NQoxdk/TCRVdhgBgVL1Rudu8JXcK8jbDfJs7EPhVwfwnRMheCGsITVyjAhd+fMPtDBl+o6P6z+gvbty0H5HdsomHHVBcAiQpds+Piol6rToMMVIUyvu+/Tz7Q48M1JMmoKMNe3jUcGIqigBVMCzxTwxk4UYjtg0YPUkfhl0v6s4u80J+Y1TxrLs+X6bO+zvtX5vV3urhfbCKAIDyh2PjRtL/9uaHsxSxqXM6NZ5abeEjT0bwlWMzp3N62lB2fzeIKRj0ls3uR1OwPNtvRvYrlZjwRbcOAzeIhigibOtk0eeYd0I 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)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(51416003)(2361001)(478600001)(551544002)(52116002)(52396003)(2906002)(50226002)(2351001)(107886003)(53416004)(118296001)(2616005)(8676002)(53936002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(16810700005)(81166006)(446003)(6512007)(9686003)(4326008)(47776003)(16526019)(16586007)(33896004)(316002)(59450400001)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(386003)(8936002)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:nov; PTR:InfoNoRecords; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:IvTF42Gbfd86QB7bYgvTijNoYW3/YmVr/lQlJZtol?= iwoKQhGrlDSMNA5FU960/qlAhlccujpI+2nGwxd7v21I2DosrjKdRDnffXe8MQNmrXOa6wZHna4AzXAMYCsakXLdk9nU57SICBOCyt7S2IrxhYMqbbO0GjgDV8xavAPaug965cUtgboKGEhmwTeb/m+35uahmDfBcOgtOFRWj+of07cLLcSuK4Ooc18lGP7jLaXZOKY/fPZsrdUmJAqrJtZyjmxcePfTAxO7PqYd35YiEgymRiFk5VXo71rS7GKmjRB+8FyVuxSYFlmHAJuBPtkmw+v2JZDHHBaiTOEJSd1R82Th2GcMiRuZZDYErFIvZcpv0GoQpNAyCkgWf6WCaJbjGQyQIsVMatCdIhkXv4wkuBFesZ4pCtXTPK7vGZUdsMCuEqpIJU0r7BP9ebUoxF9XxZZSdt5sdlDJyn4KqCswGoN48z/yDskTJ47cBcR+VtFxY/eZ7x1evn3oq/BFZtH2cq0TQfWDFxUqaZ3IzIhuq3qprwdIubX9ItPFbY/YF6v8XCTPb7bxoxDq3ZYn5HKv5hKO6h5YBP6YsRL2DTXG/qsYgeHK5QdAXWh2x+SEl7YkybPDHKi7JVcqGvYVdK+par+t1GZZMCWH5ugKDAhSQ28X5F9ymoTLdEmKKFY+3ItHAG+wNyXzXpCXTs9KqLSW8VwhPDCyM3tVZm6gjShmmsdB0Acc4UlaFnzYVyD0hL72NsZHSKUfdShQHyveeCNAt6DQBMXZugQfAcXHGimuTnZVBqpLAhyIC+gia8GJe1fSwKXOt8kn6RGThZ91YEmEIVWbPKHbGJ456rbhulDk7I8JoXBU0hfYyW51waEiNtc5F33n3V2kBVemZcDoKVRpkShgFGN+MNI1vlpNRUcKuD/59Llm6CgXl/paewDTZDTK5cn/xKe2dmWe4m+zaB56xDmoMgmU4PfY1kzgGfUCfjNyisLXGe0/DVjsI0xUkicBXh3t7wtUN0PrGW1+xln/tyRaCR12ZpO1SnHZkzbMvVReuJZX4kEKJUyzZ5fri1eyBxU764f2aG/8Lyqf9vvKIrKdSzFJRU00Yv3QrUs0DQQm61fY35fQTBIZDw4DtHByrMroMq+JHg4hYRuN8QzqXCcyWbSNHzw6HSHM0o9JnGJw9QjkgWX9DhVuykh97XVO0RIlQ83vJ3Wt7xkKpF4d6c20D6FDSYRrO2IpqMiXrMFVokHEeoAx3hcuzYgrK0= X-Microsoft-Antispam-Message-Info: 0w9Ar/9t3gU3cvPNzjjt27VErmxwERStXmD4VhP7odQSp0POc3aNVnA12ShdhFFBvuuChUncCr+n+7bbojQFq/DwGYpYyzfvMPIPyuF1mmJxZ8jI7Ub06LwToiyDbx02z4MvVcUf8+QZLy8ZPHcJGAahZSafhK7pGRRsbuovUzCXgFDHOIk+JYTYhF2Z0rwR X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:yhBmOgrG9/7gWVJIb+szMPc+2+3Bq4+zIWFy9W7FAW3U04Awbt+QxFw40QFjxSfA4wZx+Xv5ZBEEw720wx0LCjz+FrcLsPcpOSbiMw3mVpq2LkuQkmkkskx3sfncIce+ir1mgAaIlpJv6p7xkGym64myR6p/35EWjwGt/lwC3s4BHZhoSKDDSiFJZH5D+imVbQ+CBApYrqbhYxsJZ6WH07isqAeiOuh5kd5+1pVQ/pbQbzCU0MbSd1y0vmHQM5Q3emvIuMtWI2lGYTGcNoqbWYCqkD/0KAJE33FZOvcJ0VTORJiOQowd5Iy6tVukLog7b9U/ORzb5jeXw18ffpOCXlbj/CnSY+RDAr5IyFVkWdUpQWJMpsN9lC9TUDhdc5oveUuETEgQVArZPZP7pe0Wdm92ypGMik9KWYKp3D1WMnMiWlgj/0HOhtNJGnyJTA+359+u2gavKP9o0M5Wgq/t9w==; 5:KHq2b7gZ53OJ2FrakU+dmzVDtPPPFyFom2IAbZHikzoutMqyq9nFQg2sJH4wZTQvlYwoZ0xJXuPgozjK1tJvTHsY/iM7zis62FHv6T51bVjPUlogBkKELvdfCeeQEeiIsGKv2hG/aFQaZPIoQpmKYgkgwivwLrtCvnmNvabV40w=; 24:oKSavplkz8jbQntKD19IRr3ZiWVnWpYhrScF8qAoZQVseyr2P2uNFSdboA21ZmWIbVwIBmMrbNa+Ultn0pBT46AVdKI6wUAIeFMkS5XsUTw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:f4PCs+gTXleUMijdo5gu0+OTnCjQuIcZKSHmykIv9Ybub+cd4rzxtfwXBqYYAnuCISPaRkv5NbJkgle1YMOa8v+rbZx61F/cp/0VnF/roL7biAExZDNnUThZAWpWA/MorxqLW+tWsmeb2m5nWKiMGCTv51c7e4iUf7LgH5OFHHG3mulhyU65cbdSg/3FApUp+kfP+LpJQBj0Kpq/blWB+hRBrZRIV9zrMWNbBsiqcGQnsimBjiAdQsiW4AG89mei X-MS-Office365-Filtering-Correlation-Id: 3f0b7566-bb71-46dc-d27e-08d5a4e89b7e X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:28.4221 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3f0b7566-bb71-46dc-d27e-08d5a4e89b7e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215557_522838_DA35765E X-CRM114-Status: GOOD ( 12.28 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a01:111:f400:fe08:0:0:0:61a listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 --- wpa_supplicant/mesh.c | 84 ++++++++++++++++++++++++++++++--------------------- wpa_supplicant/mesh.h | 1 + 2 files changed, 50 insertions(+), 35 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 3f3461f..82283aa 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -147,6 +147,53 @@ static void wpas_mesh_copy_groups(struct hostapd_data *bss, } +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 }; + const char *password; + size_t len; + + if (mconf->security != MESH_CONF_SEC_NONE) { + password = ssid->sae_password; + if (!password) + password = ssid->passphrase; + if (!password) { + 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(password); + bss->conf->ssid.wpa_passphrase = + dup_binstr(password, 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, struct hostapd_freq_params *freq) @@ -156,9 +203,6 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, struct hostapd_config *conf; struct mesh_conf *mconf; int basic_rates_erp[] = { 10, 20, 55, 60, 110, 120, 240, -1 }; - static int default_groups[] = { 19, 20, 21, 25, 26, -1 }; - const char *password; - size_t len; int rate_len; int frequency; @@ -291,38 +335,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, return -1; } - if (mconf->security != MESH_CONF_SEC_NONE) { - password = ssid->sae_password; - if (!password) - password = ssid->passphrase; - if (!password) { - 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(password); - bss->conf->ssid.wpa_passphrase = - dup_binstr(password, 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 2e2f3cf..9952102 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 Wed Apr 18 04:55: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: 899885 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="r8FKCR6t"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="soUWmaYH"; 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 40QqZt5p7kz9rxp for ; Wed, 18 Apr 2018 14:56:18 +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=dMNsMMWIIg5GUUiwoze1inqoWMan197kO+UB8GV0NzI=; b=r8FKCR6trKCeWB l+NP1iLsI1ppOfnnOj5AQB5YUqvh25nDtQUWKbpdkj4hKoz82ldCv05ko+ZAhQKjX7d/K7l81JCdD X0d5nWmzE+iYtJPrlccFNvCOz8ZFXxsALJw/u197XdMV6P1eD/n8h4zGK4Vb9zJM1Q5enYpnG2f3o WgBt/NRe6Fc+UHNgp5+xPfbEg58dqbB6WsCTaX+R1GL8N8NHTM0b/5v65iYUgGTbb5QulUtg819+5 CG37FAebDWvlBg6CSCgpyOTNAivHeVMpUkxnBI++BZhh69Rj5yShFERPnZmB0jJ9FqGKphqUFnWDZ HfADOUubFN31QOqld6+Q==; 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 1f8f8c-0003HI-67; Wed, 18 Apr 2018 04:56:10 +0000 Received: from mail-he1eur01on0078.outbound.protection.outlook.com ([104.47.0.78] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8F-00035w-7Q for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:55:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bowerswilkins.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=foJpu84D4tDP5/V8oELoQB4MBKgzBEB+mMb3/auGNP4=; b=soUWmaYH+Wj0MoprudC7N8U7NEz2lhbiKewBwCkK1+mnhzwS7LZ6br+pDw3t5LTwKWpU+Cp4RQgtATVOhFdW84GPccbsR0Mg2m+ukgCRBS9svPCDHe2UmH0SfxEJJwWgfR7PRk8YVWNzF0hu2z/b2OjD6e9LGWTXloVMUmWnif0= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:29 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 03/15] mesh: relocate RSN init function Date: Tue, 17 Apr 2018 21:55: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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:czZeuIecSIZp7FPWD7gsZGcxs8QLczPfaeVpYjLFnNHNymnB0CrAtbQieKt54AOBoJuFNVnfA59jiAHlmExsAStyP3fcsa+LBRNjfK7tn6QIgcb548DENh3qyg5wOVq4zdOAkTLOMOYj8uscH9bgp9f2DzKc03xCbKbHQjDBtG5eOynWWuuAy2LBqG50rHwc3XWAUW4UN8Jf4lYB6cFplV0OEgEv7TnBzAy7CrYBH476XR4vAHxnbFp6NBqER+rV; 25:ncOIF1UWHUdx9JVbSiJHZKYboOARXqOOpiy6HGiNd+XnB1HoEjKxKJmatEtuxS5+LfmeaFYF/wtWCTofMSn3rY5bWvnivP9K/ApJ8mQPgjVm2BHG99uzd1qyU3haJ6OkYLeqZFXJhKPUBWzJmanroDoDWRAwVxKkq85xpIYzWVyZmY9wzToIl6mAtEg55pdDFI+SUdNSjFnvERJkX6VGk0oGXEnyBf8oR1AMmV+Jh2D8F62FYIHjnRht4LuzC5DMRgB+T17dYWWUq3pFub3cqP4rz5QONDOR6qJt/MQXzF8iHeAqsIvOdZbT093bj3Q8rAuQQ7nZO0VuLpPTdzrv4A==; 31:wFcJdSAjrMoYbfiakoERxMLFzjKhNT0L049BTBkBiV+9iTr+1hdK0Doebc7vx7LVAoAUE6Xl2beEN67DfWxjuE0uyLbCYroHHDxz8PyD+Wcsdoy0yGx5+F2AjAQ7NUX/6l2e5AREWVAHGZ0uxvZq66RPPCjM+mO41glRwRmiSvAg28HtpbBLPKEyf5ADau3oIoKO0a/y6ez9uCbV2uWd+FXwgXhskhmyg7lKjqTLAus= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:9B9PgKNl0Xow7qqHIjrze6bIEfsiL3V6I81llPNkfOn0WqpMbd7/x7CovfhN0gvLBA4NqCLmz3e5vdcOVzRDmjvcSUtoDGfk5e9mLYME1T6mNrecA74uDXry2MZa36MGs1+S+D7+IvnY5H1sS6H2RTnuH27aCqpzsBEEwOezqeQcERLVWKyfJMK+9tRW9HEmZ9Xs/4qXapmVdtDfpX2+I9VkcIk2P1BJymBMkixy0KEZmjLHfvnfF/8LvfoZBmZPxDGHIdje6fDrN0OcTsXSSnx8I20kpAXYeZB6UZcYyeMN1DlWB5tZ2oWNU18U7Y+eQmC4l3ZjZn/p9xpy/hDuDQ==; 4:UYqy6EA996AXktGtBLpRZpswLMdl2LUWBnauZUjaasGcHGGFBxi7GqKNPx3oM2Yvq+gOnJcqxrxXhu3Zc5qtCOXG33qseR47s2R+DDjKa7RE+tFtmE9jGwLoV4uuD6HimzKseR+EYWmgG7/3sFS45vDgeaq6H7f0CeJx3VLn45BLX3493OI24Mt8FCEkGtLy6dz9Lk3BNAYCO88cM8F74ST3puqXW1mEQtMdrE2ys4NtSERm57rDR+yrY7IR9XNAyAiCKhdjr4ivFNlUpyEBwg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:zuZVT1a82mODAaPpwSi76oze/UHTxBI914k4Kto79?= F3j9pqQBJYOo7cxmVrFpR5qdegcU3pha2QLj+UzG12ynyPX/Wgk5ue7vwPmGYG8x9rMVUjlAXQDMgVGydnNnIt4RQUNynH5OXfw7B1RfoZGo1ZrCQD0XVXLwcEhcfBLEyBswNsaT5SHW2fCHe1tafzv/U6FfIy2nRGPd7zDQvYPxxmeKDYwVGMotoZFgYA+gLM8miPPqB+rgEJ1wyLImzh4mBpHZY/jDX7lfiDtY3LRqTZD350YzLh9DKf+iK1wmrelLlswcBAxfHwTLCWGziRvh3S0kFuzy8PG2cFiBvtkidpsUqIbCtvmK04Y/WMnUt9+zyamf9kap6eS+PhdyyJkzCxd56ewxEP6YZPinJ/NzdU9Je6gjNYSTS00g1crZD1kI6cCVNJV226dEZmUEX4+7zfxUSEPIiUswCV/fUoZ85DB8BE4gVjZWgaLYb7MhjT8tDAf247yMlYOc0ghK8D/gsHXqHt5g23byocJtO0cqWRPMFrRu1s2jgFEmcsLM3+WhHFZf6TFnJU1x+9Bq7es9EfOpjzDoWMu3E9AYi4dRLPj9FDhIE9E1CPubfJNtI1LKroKS3ed2nhCwyOoODZc/l2E+qsfVswlf5utg2ni5L5BgluVXY1WT3JhDD8UOXO5hHpMKbKscjQnFfqF7G3i16eqZNCGDqc9sHAGNjGwUJTOfZ1sqBNoRRmBn1sfOivksTGWVy2h1uVUqivoagfZGnQ6hRQOHGKhP/ikIsahqXn71PysItP8GOOwpv+yLW3TPIxGxCf5ezea2mgHC8AznD038QjVtuQEaGuLeMu4aG8CHsV5uNXncjv5ECCJgoWzrM7d0MdleIaavot/AdEtEy3lVLrsDjY9E+CKubGom3Qm0S8jpazhbVEz53P4x08orjLr2ZZNRnAEncviYJWZA0DZOXMuMmvKa9D9bxnaEUnWXuUY/lyKBiG39Bbac6hRo+DM4ppjsOL1FQq1srACYVPuoze4o8rK/LZddtF4pH591jzC9z+M1WIlNvoHbIU= X-Microsoft-Antispam-Message-Info: hLsJnqDaNc8N5XeXVQ59Ui45pjWDOiWJRu6Bis3Y8Pwnc+uw5Z+QvqIVFPG15oPV7pOCNLrlyt1Y4X9N52/tzZZBQ5jFRGZYxwkQWk76h1W7uB+VA3N1cMF8g9MQaklcUKZQcDnbDvsU2oLcVOM6tMBDGPA6Pj1wfUb4aT3DDr1+uBAcFTT45e+KmlcNVOfR X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:cAJExgxJ3zLPpoV/nzr/Nsq8798+rOW4U5POlv6MJe/INB3O4n4M8SgFq4RE9jTwOuwKeHAv0Rl5iITNX7NHf15ninieWvDzULisKAojDJGbm1cz2dzwNGn3vWW8h809GyWkeqIM2nOwrCNGNqtNZ4lrDUDFQpf8JUlx6AioHKPuZPrHYlQBXF8HrqwQ84FfuBPSECpNBUqCMwgXJhqo5Zhxskj8rVrwvmN/Mc0W67cQv16O+38QEyMVYjcT3vW0WabpOkYHtrV6VLeSHXnQ8EQ6G+V4QrQP34yaXKgUD7kvyv7qlQFDh8k96T0vmUZ6J+o+WyYy8Q1EK96l1Ipv9NUdI7RoBq0TxkRnJFpxGtvv972g0C0MmLzfMeYjYNErYqbgfH632Jnc5fhYy/Buu10No4c5Q9LGma9cRyKYZNGOvCxLwXSp8zkHo+RtMf0BfNuDdRlAOVO0tzLxmklovA==; 5:ATrXIGwptFnCzxjQyUgjLTvOjEIr96qXAKMib68LW0O88UtJ/fozN10ePFfWCdkUr35Idtk9x+J2yAMxGOMNH8EavEGGus/Xeg7vwgmoA3We5WRTF1/6W8Ntukmk5D1PsTc0RUfpaPGqueEDSkS7V15NXPZFWzuI2WKjfHkM440=; 24:4UWCf/wXl7rZD8ww3n+Odu2YmQv4iPST2PerpjgTHAtC4OZscn5K6QsTGDmicN8k+oGHkq8CfrUJmbDkHLaCvouHmcGWJFzii7TY2iZgxQQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:Dtu2J+/f6BENO0DAMjVLGg6nT8aPxiqluzv1ThLeQSpFmmFBvz8WgUnFihLaC70Zu0oUOUh130a9fc0gGUHTrrFAxEJxsWdo85IKCrMDyOwQCWT1ZRiLOtkmtj3zC+L56TXaETPIX44lFHPpD2MJPxTjtWdq4xCROA95V5pdX0jKR6O21A1p8vRNx42bPnQs9S+xzpClWaMBcJ8/TsCsbZTNueJfiAjR+zV3w0cuu9UX9jxER6XIvNKEcWW/CEUd X-MS-Office365-Filtering-Correlation-Id: b9080c4e-27c5-4f8b-7e06-08d5a4e89c2a X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:29.5472 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b9080c4e-27c5-4f8b-7e06-08d5a4e89c2a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215547_290219_40D79351 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.0.78 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 82283aa..8bad38d 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -335,9 +335,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; @@ -383,6 +380,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 Wed Apr 18 04:55: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: 899887 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="f1a/xxFz"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="ASWtvsK1"; 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 40Qqbh1R56z9rxp for ; Wed, 18 Apr 2018 14:57:04 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=RNS5Rp8fFi3agrIMc+rQeEZ1orpRZKEaE3SSwBetOB8=; b=f1a/xxFzNEmEei kRmyHbMVcV0U8yIQmbtjBdyS4mi0hUCrRkpqx4pZpWLziCYqC7lajat52JJAi/Bk2uojyTw6WMKrK SJ97ApbnL+zYXBBLtbu1uKG20UTPBvWPJfSuin/6VOtoBAQ4lFP1ExcJMi3Az9lNk1J6QuLtZhmK7 YCyJ5H0r+wT+NeavEn8jXJAksqsB5Tv4GDrFies+IBbwjpAcJhReqO2I6w9v28+apbjzF1fzbZdck b0CyPSqsZty1yV4+O4jrs0aAM2WkHwOQgcnk1eRDdOPjtfxP7tzscx/9vk0whoS4kD5nWkWJOumnO yNiZs89AVe7f4E57Wu2w==; 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 1f8f9M-0003e8-QH; Wed, 18 Apr 2018 04:56:56 +0000 Received: from mail-he1eur01on0078.outbound.protection.outlook.com ([104.47.0.78] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8H-00035w-8y for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:55: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=dKSlRdo/3hHTTLrID5wqcqSlQID7yfjwO31jZLWBm38=; b=ASWtvsK1PB/kZ0Ej1KZPmnlX/ArgbNS3WyVSrgoI2DUGi5/ATs/9mesktEZyndrOdZWLdHu91ihydbp9pHYBHokT2Ih9jsNsMjaCB5MEAQ7EQxRTBzDo7xvO+fzp3S1H8Hbf111VwGqBoop0d5/lP2YuIuyF0H9HSr6ooDbuVgo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:30 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 04/15] mesh: use setup completion callback to complete mesh join Date: Tue, 17 Apr 2018 21:55:01 -0700 Message-Id: <4c67aef809be850fb78abd378154ce3350f761a7.1524027184.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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:++fHe7hMNrHhu4z33rEGzPktWwLHIbPPtEWguXWXxYDe57gQudK1ftUKKTdE3IWmcdco1HAPRnUGAsfdvH09jl7gCtfGxttBHyDtiC6FktZLRKEgZ6QJypv3mw+pG5sMVivuBn1N40GsiIUGBjovJ8x2LkHUJdh1mjSDuhAWO2hUTTQGm5rwajTsoUFROeFsGBbCzOSl3ahD0v/eoRUJ/2q6sn4yDow7jolVPhthi/+c6zRbycziuwvGY8t2rRmn; 25:wjflqxQsiQvRhL7vkiYQECmcxcWo1RrKMZQYMmHWUDOwMuYM3xTqLBmQRGAxB8xSbOzOutnLaUbJ24qQhydts48p+Mg+iP7KK1H66fmDrJ4iKAJSCrFUWgLf7Nk1GK54lkhsE9RA2xC7Hk5eUtebiunHo2O5l4T4dstvGvdFnvTp3SsODoKdwsVMEKkQ0JyLx+Zq/Dzrzdjv7WK8z1rM6ZG+Y5DLqqm2rwD3qbY5x3CPTDt1qBJArAJrJ5cRtDaaP1jp0KMTeCmAv9/rw2L3zkP+NVKrADOmyhftVLKnEOfyXkYr7cmtgczjo30Tc0DYt/SbI/S+TWnRo8YzJBOcuw==; 31:s3gdg7SIiME34Z/+QVnW1x0/Ze1BJKr+/N302Z5KSgkp2m31aORUrQJSnOYY5oedqnbTGTpfPBctb6ud5bED27vx6bD8UxEqctx5XoHMWd/c7jIPToXQRQhBv4uSp4atSlPUJq6BNYTft5IfES878qIWnAcKf6xfLJQnBVshdlCDvVV03CCEoFHohDAnr2AjmQV+k+MBPwjv5hQnRJrRRz91cxikcQy9z1YHEIJ7Rsc= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:ly3vQftJfxMQorulcDW86dfLeQ/6qmnVSFxFlwiFe8UX3HKduw2JTLHC4P0swcDJ/Y0HoAQnYJQ7sopSsWS2c4dEvVHycStrAP35Nh4zgyHzgdHRJO0Bh3DLbLRihJL08TMMjVBYldpSWIlWhJT5gl8gwKNxiEWYHsJV3FVU8GMjfI22ouZB+mVEG0a8bpKTQDG9yFmwWjl2bnyOgpod+vImynBsggtsP3dTN4WpfVruEjkjiLUihXVYO3ZelJNW7wmHB8b/ksiHiy52ZfeeDpew05a9sQ7v54153P1NptnRjpHFt5lDfVjMlxBZzk8DoEr6zEdwSbL7uPEl1agjOg==; 4:XLjPJ0j3MCc5mO5ROyuT8TgdXLzAjHXMeM7dqY+SA/Fk6ed9l31UXx8Z5EzwRhN7uOxOf3Ism84u8nCgSvqkdPvOQ4L8MFrd/OrNtsZ891+C92JJxlrXUvm18TQ2qz3fEacpQ9U83P0t2r4us63qPSZ19m+qHkNzt17dUFDPbi8iS5zaomrjAlC3p/6p+szfxZnbS+ymtjRtRlYqMsjjivW4Pb7Ync4KpnxDlWKdxgoASuG4ScwFw9IAmU/n5RP4bgukvwrzBkBCE3M+MHETaw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(51416003)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(107886003)(53416004)(118296001)(2616005)(8676002)(53936002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(16810700005)(81166006)(446003)(6512007)(9686003)(4326008)(47776003)(16526019)(16586007)(33896004)(316002)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(386003)(8936002)(85772001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:ovrnspm; PTR:InfoNoRecords; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:guoPdCCxlx27r1VdWGeGo7jWlHEKCa842HFtLRe7W?= gIC5xJmEx4gebqXqtDcmw75nq9hblIDVZdQfP8RTqhc+PMcQYJyhgKTriqdFn+hKkHCXLcg4BwD1qMZwFkREzDTvvslsIb616UCCey1QW311tiJntJJhLIe84zpTI5QpiQQgG3gbCSArPbl+vQ9ZxJ0ibL2H25X2kgDsrsj9dvBYcqiHVU7iAp03h7EiM0HB00vMHao4woOZC//1+5zgqYv2cbgcuAKu4KQ11F4zBlLpS/8uo2tcu0X+CQiiW6pLrD9K5DGHXhVc4003jZBjGDjQ0bX/tREULRy4eQjuYItv9fAZVfp6yG0+jbzkx2z4Za8Xk2xWdOpUCAHfaNBYmIvshKLc1PIrGmYE2KlqTZK0wjPU0LBVzCuOIdwbFZBhWsknNWH7ePU72NOw9HzXzdqQ0ZtFqx1ioU55+u7TU0NEF3k4dGKr26aSALcd7A9x081CbEWQD3qxPGhg1abywGq9Q3830UVvAn8/WHOVt4HQCGbLWAMW6c7wEgX3AkpyHI/iODIdPTCN1tn2s8/jIGhHfGf93w7pgHtJBCAaSxa+cCoDtYo6cKTo37ctAB2rpGLgIBjMxjsOJqoDMfw1s0ZaWxu8dKYO9N9QJkw6No4/k8OWXsigMiaE5gl4JmbK64ugqJmABEw4zEMmmVaJYzSXDulbUEhaWY+7hdaRAsLeXuZo8cX9dwYpC3CLZerytpcNkm+EnTyjJVRLUf8SS84KiexzUNCuE5FCjab+gaeuMSIiU8z26llZ8L2qcdMS7yKpXIq0XGL4fXqJvWmim80DoBA6QaiNvfuGwThedMBA+byZOWmMLUzBns9sMyGneT+LmatQ5bJdAcA46hsxScQsVeBcsW/2IdgpuH4GsLecVjwTqNRxhRRMSeOF8l1Yc48RP1q6Hk2VWoCKOJQh2+DT1yepg2qWiyTW0H1VFX5N+zPiVXAhmD+iXP6pWCCWrDbIEoAlzsqzKaABJz2gZGF94eI7QZsTSxt3fMqanHtnWLvOtt/qe6/TEWp5jpN5zPaL0igW+8KWNC409YNO7HIrx14W2GG1SbMF+EU4S2ahkPNa3p+tLpzBQm1QIVVII66YoAQDEvdBipMDv3DgpWyQC+OTrK9miPO/+FBFN1+nSPCtnnNMhwMWkfDVrFiB4gFHtTYTe8UL5Au65y9Swyr9r22Gjyyh0HE1LSznlRNl7uQgbWGSTw7xdhGHStKQNqsdmIfs765wMAuZqFihrfytGVggF9l/bvs2QoOr4R9FA== X-Microsoft-Antispam-Message-Info: PWBfcz7BqKMng9GNX06n55qMIpOdmsBWc1fVMgnUgZmBwVt4lTJkVxwyXB5E7gk9+Vqny39Wabur5J+KF/edAgWTroox2KwmAiTC/T4a+YcAqMBx4Rkbn0ioC2F4PjQKL3MT+9Xw2Wo8zh1yOJ45z2zNfIsHWHLCjJf8XRcw8OjePk3oNvmlb+yd7uPk2oe+ X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:S773PxMeR3k/CLVhl+H2twh/zYbDwtdcBr1FFQlrTuwp0JTeUYv8qRxmnGKod2HkFA2CUd9So/v0ipszQhBhaewZZhLp29NvPO60Kcrp+4zh3jEEfBF8fRQ4YRXbDFSDbu0dXOP3hGyDh5n3UCbrxmPwPBVifTnXaKYHysaS8SobnmSFCqmZdyF6nlqmarG3luRMQViKQxQ1ZwbI0A9SpCF4X/g6GImnzTDkS0LZ8SqSEPsD41/EFON9tZR/n5vT6w+mhclfAtOA5nwPLuFrdZjVNQ/tl64A5JzbAQ981PzrYrlQFoQ6F3Hud93SLFGJyiL2ZfFI9CLXjQ2acgLB35hiE9haWerPpvUJlosTqGuxtIwrEmZdbC/on13jksnUXR/hFor+HmMdHgrSvybdF8YXJxuB3u+PB1QX9lkGAutSg0LU7lp5oRTnwnyTnBAkiIe+OTJ50klq/eRAxCnNYQ==; 5:ITjLTgbQlsBDbBSmPuDRZP1wTS+2HXBfVeK+KedTyMdbTRtKIOY325YTsM8AvWFfYg0JV+SDnwOLo1V26cnad93WrIZm9C0W5JYPK8m13vqDV+GCUn4/+N17neSpQrUw5icePxHmMTIEqxy21MPoILwtoMxwV6MFIcTzZ4UvnkI=; 24:7uy2NprDiFHvDnf6MNlOtBAxW3D7qGM5kpjT85YKdmbRpTDzHxJr663dfGw/KmsDwrsZqJKkzG2Ougn7UqjjVIxoQYCYhfKyavVvgqZ1YXY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:af0xZiVqB7wwT/cUzVY8a2FELAukdETFbfbHiz7qWjza1InzG0NeCD2d/WQEPs8hWL1Lp0X2hCZ3gBu9D+BkoTPXwQmfTnkrE2HC38I2Upi+1vX9xq0xuriNlrujO5wTeC9N0/CsI9XKoB8/kbLfpJmKks83Rcd5nRieAIVupCW3HxTPhjbdU6sEOsYNPGrfFs74KKV55zNul9YffIdzKvwM7fr4d3VuU6Y+U+Br/raikeRfboqKUp/BbJe48Wz5 X-MS-Office365-Filtering-Correlation-Id: ad43388c-614e-450a-8bee-08d5a4e89cd8 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:30.6879 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad43388c-614e-450a-8bee-08d5a4e89cd8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215549_362829_0D14D0AB X-CRM114-Status: GOOD ( 11.75 ) 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.0.78 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 8bad38d..edf74ae 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -217,6 +217,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, @@ -233,6 +234,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) { @@ -374,8 +377,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; @@ -497,7 +501,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 9952102..2e2231b 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 Wed Apr 18 04:55: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: 899888 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="djT8eVA6"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="jTLBoDrz"; 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 40Qqc24c9xz9rxp for ; Wed, 18 Apr 2018 14:57:22 +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=o8fDuGS7v/RUaxW1rGgpAEreg+RB0XkCsu/N2Kgz+yA=; b=djT8eVA6U55Jui zmsMGomB5Yj98z2fAQ59SAzkHipFCSxbmwSlGHp/vtrMOawF17lf/Mtto4rGUdL1XnTyTfPYlXV++ RN5cNpl+ftK0z6q+M2Cif55U/vAh2OruFXKGPogPXGAZJKegoc06PG+YEi8ANDP+5YbVR6GVYbbC5 me9XWXc6fu7Up9PoBnHEH6XjYRRWFV4MZhpV6A8vKbrOXNZmI7I49gQwncEfr0Hd3bfN+PL4mhMsZ bk4cpv+pyjEVYyTi5cAuNbZe2DTtM01dxjL0AGe8QT1wxCqxI1joclIANX9oJPSc8Ozb480C6uDR+ kPNNVB66pLsSKeorqjHA==; 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 1f8f9g-0003nR-5l; Wed, 18 Apr 2018 04:57:16 +0000 Received: from mail-he1eur01on0067.outbound.protection.outlook.com ([104.47.0.67] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8I-00036K-AR for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:55:51 +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=I4YgJ5YQjeTqnChaEY1Qb6AHl2IwogmHkN/W8FG+6KY=; b=jTLBoDrzdjF2N/yaQnOFVrNTBebcDYD3i2KR58lnYj33JEbAlGGSnuFID4qCEf6UvO+eoU0uJ8zgkB3kohi4uKgg6qRRT6/ahzo/y+KkQgvyATHB7XnN2j5cChnM3pelCFtae25sQncYP0KpfXBUrgUYOVVOoebRYr9WRhPEwC4= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:31 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 05/15] mesh: reflect country setting to mesh configuration Date: Tue, 17 Apr 2018 21:55:02 -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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:RhWWG2hIYuSkhyRi/MH90eAfA8lCshyggb29/JJ10MbBEWZKDW0XJEgFHnliZCH2e9Arg3pRH//Ilono10tpXKWNM4sI67386Wn0Z7uzoRTi1TnwMdr9qAoQJHkIAa3qvEsr9G7hMWBlvmqKoSUq59Drz68e5rqMyF5v2wGWHGjDx8NcXYU/7xMv0evYQ22l0s4Cq8FInAGzRHeqcDoxq4GCYd1lLIIP81x2KDy9R8BiqRF2hMkk+nrnlPGoZFNV; 25:E7McQm20v726uI5YsEDwHAQ+DXryX3j5hFGIXCp0f/jDq7p6MZww9yuec17xUjrk4IixdJDYlpO8Qvb4ufD15Bfi4J+m+vq1tKb4YvAyZtYQeihEX/FmPxN9OcADePLgvQ6mRoMY7eFU+yu1EmjnQjyXxT/wKfcdIR1809WpzLNkwUYkcnAs2vja3mVLXdaPmXLNlAXksWU0S5A2Q7GDmmJjYfziYIJQRDsY/dSeaiopNbWAmNHrf0OK+rYMjfyvuKeJUDTsO96jWsoVwKgoFCXLrrCRvOlNf62JOcDg5Kq+NqnzKi2UChI10OMOvUxNxhjaIBImVK7DwHL4R3ifRA==; 31:ajGEVyaCnFckxSAheJaCs9nNXvfWRyWE8ZdjNzS+f4dsa3aA6ULansaGHi12zferTvLnccvhFa1XLCJ5cRZ9necoR1zvKYiM62Xcd0yhP6LbRJWY9Ucbg/caHytzKfyI9k5tIzUtLoxakctXEqsiy8/zBYcKll329gjC1zUgyi35hqF1MD5njnEImEOA/qJmqU5WpKfQ6eEP9zZpyO7AhbeEiM8wMXcjtqvw/S7TTfI= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:zoiTv3QvmI41luWWzRisRidHgMUlzgHkovQnmh1aBk349dopDDV/YsuDR7sw8mh3dVeDleveMCHadPLJslv6lxc+7HefMbdZ4oHJUc/o4h0TjY55Ao+Kd5OhDPCOICmGtupvYanzSASvL9qY/Zk/7NbLgtAMUs3143vRZRHi9UZSTxm5dWLtoHePptnNfkxRwXIs7sLCK7ufy5fdRikqLh9HIBPiXhDZ+/HgnqO7RnR9uLOGXHHRl/vNPigGRBBxYtR9+nqX1oF1cE8ousGUpb8Npc3GV383dz7eLkg0pa5XUOmrgYyA0cClUeSazMJ+hKurr4LTVnHm7dafSuY9Gg==; 4:r177iKC08nQX2FUkHgK45W443m/cw8DPBC9xHAp5Q79Uw8Q6IneK5TnfjoKivk1KFLFCxxIxIcRbcy4TtiOYn48m63oR1hmocMX3afsG2nMDscpE4af1sy8SybOu+YtYeYctCxsoN2XKOaskIrJmu5RDPasWxXK1eUOsUgc/pb53bOMOVSoECAFSWFHhkXGYSHKM2VzSsxCSnXxWVl5Ou4p++McIYC3nkh2hHeIbV+VDQrxnfw89bCZFRCSzQcGl8k8XHnX7qKDpPIO67rbHeA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(59450400001)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:i4MkdxAmc/kRs20xpVHgvtTmdUyfCYJPs8eJ6haUS?= DVIgwRfm/2XsolKKj6yeuffn6r0Vf+r1mFz46DiQvM8Hc2amKyZSWt8d69/bClXMUrtlmC0GNvDE9FvNmfv87WtAcEVl1N4NWzyM86HN9+udOHMsOIa+Z6GiQhEyZlO3JfM82/OCEoPEa/QYg1gHJ7GUdFhNoA594KmlWJs4RxjbWFDljXwT2NYRaYjPdEb83tZZ0UKpIWOhZz8MA9KgXajMBji8y4cr/MsGsdLlHBLP9YIm1RTXKYbpvObHwxBya5CZEjoGUKZ4759gjWrN38xv0Mrl1EtOfegbWPFOnZMdcwXiqZGykEwb5RnN35MyPQgO8W4+hmP2yzG+ur1VkkpVfdTOAmkPwEPRGnxQ7rQ8jFQFvfRs53cvL7mRMdJ+jS2U8ICKrWvX0CEDP7EImdgg3iwmOA4stblhab8NzCWkiKIJSt8+cgvMJsbZsb2PMbIbFUh1RIOvxnR5Ui8rpgbkoIpqjPypjExM/l4RkVwScoHs7QUzL/48ffIGH4+e+WHxk/ELX0r9SjHaCejZdB6uJDPH84kQOiW4fe2i3qovuYzubCWIt/kzOEsg7REs7uEE1qNiIsC9IbEUc94C4FwxhA3dbcOdwZEc5BGBJwV/PmFIRCTTVzgp+fs0XGEW6ZFvUrY5KAszq836KFa4B4VbzGB5HGczz+DuUev2k1N7+Pto0UPA08OE2rh8XMqLfaEDUzV8aziLRD8D4C/+vFQRPjl4qoorI64qf+alAN/n34os7UHud+lJ4ebQmrytK0dHcJWOb8taLvDfNCh+MHQ7960m7Lmfo3UBlclqPgw6+CMf+TpTq+rXn0nppgUJmBOQmvfKbjxgqJBIq8XZxtWHm8MVHt8/W9dLmSRje5Xn8ZZRewXHONNt+6GNH9Ctx+9xfM/Ey7OmFMDPrh9a71dh+YxGJ+7zszeMXhYPUu//86iI5B+GZP8c95VpbhrQo+Q4ABS4YHhFCKqhoAZ8bq4P3176JeH/jAaWLgLaNWa+i3tkUVhvEttZPgcynhID3q9VUE5mIQ4gV+6JIIkK+Nb X-Microsoft-Antispam-Message-Info: KQ7BOGKfaxDm/K29OkVMp+H+fZXnw8L8sR37vqeYm9qYJY03i8x96NFSlNkQDqX3WAAjboDtDl5dLA/Kndmiap30WA2FgzQYiJUi9TiiKhcjkOyuR+o3DJdpj6Z7cHZYlpPFl1hs7r5JWs39pIpEB9Ar4o8NEx2hLS5H8aNLmeBnnm7goffkY9fPsiG5kzRu X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:r5ZLdlQEYa5zPYLtHe0yY2dPvM8gsXMWwCDLtoFpTl9z95MuRxc+iy9yiVzcFmoWsf9pwJNoCbeH8ji46jcEmHwFAv9xNhzSK2l6epCpkTY64yQ4BD5Uhk2bOVtFiUdf430kG8G8nK67nac3/2WaNoAhmgMCZs8lhK/p0USgDHK8ZBXqFsjV84F+nKOql5phWDUoqbZLQLDHJ44TZ/xp5g1pz4fIQMtkqEd5CpWU+mYfdouv92FSjGdqWFgObkGlbd3qPSxNzgW/k5YzlDMCXOrLCeag+6C1gYmTZlUWQMqUbUw1SmvQUydc4IETmDQ41W7WmX6ARerE5VBZKZupa8SzGjYK1aakb8NjZo2B8SdtfGWrX9dzu3DyZ0ySxgzFBDZWJRjbJ/tr/lSELa6ae2PJtBhEkPE3SApccqiteLk1cKRlLrR7KUJRECwIrKXdLkZxnpXdqni+6CeyA3lXxg==; 5:qfbbH8gbTsKN/CcZwI3daaVegYX9SlspcQNGzSk3IxgniuI1EvMVtxRQD9nOo4Mi7YXv9VsLwcQnSS7Cy+CuQbRq3DWp3o4xld39bRLM/WDUsqTinajOf5/+woqclSTY9QgsWyldQIFhcfu5c65t8GwbtlYDDnwqgIj3aq+IP2E=; 24:USu7IEMhxU5tjLXMxKJqlWHYoOaE82PlgJIU8z+YXPb4sTLYvtc70GUJvyEaYKmX7FC3VFpoPkawn1q7TfuRAgeDV0qqVdIUimcc9/5t82k= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:zeK7G/0zvP1kalcZCultzgzyqQI0aLJXjylLx/gsZ5CioIJWmdAdNUefmOV0iUUmDeLLVIN1Csl75eYS000WAX/R/xEyajHLwnBvrtu+UqIPW7jyZCg2E0LtO9cNVUaeGOAKLZbyOlS6iK8zVm9QDlDiw/f1naDFkulkizGBtxjuRfUmOmQO88SzKTg6jmSqTh2rhStY870fp6Skj3xpW3gUjEMwe1zsni8FYhOK797kWv2CkK34UX7suPiO1bPU X-MS-Office365-Filtering-Correlation-Id: 0cefd8b2-0457-4bfa-376e-08d5a4e89d84 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:31.8286 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0cefd8b2-0457-4bfa-376e-08d5a4e89d84 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215550_408722_9E32CC35 X-CRM114-Status: UNSURE ( 9.20 ) 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.0.67 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 edf74ae..34d074e 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -254,6 +254,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 Wed Apr 18 04:55: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: 899890 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="HvFK9sD9"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="cYsZULNx"; 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 40Qqd00G7kz9s0b for ; Wed, 18 Apr 2018 14:58:12 +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=fxNIhyHAOVJJiOStnGTRXaxwrcpstuMZN7++DPyBtxQ=; b=HvFK9sD9DP2sIQ afe/VY32mtNxASIQ2YGVAVC0MYAPYsldLMlRwNif7jiiAjqlcJ5ylOPe1GEqQ/4cxuihNqDC6IsIw OLLzQiSdjsoRN0qcbLJrB1rzFJmqfUS7qzt1okw1a7LN97C2K0KuBvA9UsRU43NZK1veURM4AYnc2 rupOP3php/uhUlqID0aAYa+PcgMeuzpjJPaGWbHlG7YB4kQiuOWUnmmGrBC64bteuNg8ca2FdJKwi VHH9mNKFrsqlydj9KzNNExx+Hd+9dWPKjuQ7uXC1xYHTj3tnR1CaNai2P7I0B8aU1H7UudKV+Zg0y GOjuP29q78DOYKakPLxw==; 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 1f8fAT-00049e-MC; Wed, 18 Apr 2018 04:58:05 +0000 Received: from mail-he1eur01on0078.outbound.protection.outlook.com ([104.47.0.78] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8J-00035w-J3 for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:55:53 +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=jP7r3xshhax3pkKLxz53jSwyFnNOwj9wOLF14QV8HwQ=; b=cYsZULNxVKJo6y1D48ezrU6QTYn5jqB+ubmW63HMDKPwwQgi4hSRXoXVNWt8WW70mPDdYVGQVRHnmb3HtkQWVsOyt/Yp+rareYGPga6ePdr4Uhb7+1cNi1d7ZValyQTe3462PB4CGBtHbH7zF0HNh9Bbi4ki+1bfoB9/tCMjnbo= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:33 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 06/15] mesh: inform kernel driver DFS handler in userspace Date: Tue, 17 Apr 2018 21:55:03 -0700 Message-Id: <077319fc578cee14829d40e3ae69612f8ddb18f4.1524027184.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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:SJoTUVO658Nx6TnnL82l8Zp59GZxS4LV9N1gTnk7Dp2lTuPj2Uy2/ON/rUuppdM0EiHNeFS4nac36QeNmo1j6WnBN7KsCD9HsaYjm8l59wzg5pLAifPRCaNR2k3dK6k4fUP/vtIGDMdaEBKmlJOxer0XQrvILLEG6oQ0XqqALNNybBlK3Z5/AO1g1P8xp4V6G3qfodzG1U6tDdlGwOrD/xR9Lrl2Gqw//+zGZwWZIMLlxol5xGsKVHVRptJiuf4a; 25:07/uNVnrsPY4IVF7jQAjng5SuUuhGPwuaoC+94Ar4xdbheqOiRH0CC+lPuBwvszAYBuQ/HP1g4NQjmvaKCTmuJTmfHP6asNLPRyRfVWeW0CJHvYYVHJVjUO0L3z6CPJIw+GyqOJ11GqsOfcwY4iVjkZBRjaJXBE3O2/TyX04Z9kgXuve8MLwnzqGLim755aeGZOWFC/kmPoGtpWoGt5hDTqP0Q70KaibyFzupBYRhjJ3sOhtJpAex7HLip/uaRMRr9ho/XdZ3yoAnfrs7OJ1f+EziC4DDvOAuGcHzn8wwK+meLlYTkdsaA5RpQOARNQa8Hr0m6jHMcGWv91RyywD/A==; 31:WAH9ccow9sm1vZsebkMiuFJR/dvCMaNjO9L4aePKnku8E0/f/ZT6/rA+0b/8Yn5nC6PhXyAF0gRSy8RFpepAADr5tBVDkzmG90jjVIYyuyjrDPV291x2Lbwg+RH/UUs45RSvhlBveyixqs/UV5vHhmeULMkbKydDe91/7z8NM4MtXtEwMpRmbPmgpks3exz8vAL51b/9dHk0rUCBt5CGEXQgeangZbBY11PPWegQ2uk= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:iLYX/cz1iFsSxPFtE9ZE50Prt6zZS4LjP5X4Q+vs3aNLn37lOg6igE4+yhpuNxsosINQnj0IbtCTaOyOtmQwrW/LToWIS4+9hI0/daha2WZVEwZ8O0MLrhWOcN91Uqurb4mcgSMEdVl1t/ON8GFBkFw2FbLGaCVlSGE0KvKzUT/hhtOQsj74T3/Zau21FhkgH/WJ24ZMQ93Oj0NbLHoYyP1QqzRotahiq40hXOYeyZ+ZsrcUlxXPm8dkd8+PvtHsJVaEXOqJiwNsrp4x85kadMU6M06Jw3Qsb5QaAdJ3td3X/yUaHYolVJwcFsIxWJNdWy/Cvt+e36P0vRyJUBYM6w==; 4:A7W5RqZ23x9fwYrcduvLCMsC3+n4F++zqOSqai+Q5wGRgJo20m5FmoPfG6l8f7NhYXycKHiguSTChCRJWwjqzSSPHqArY/puYCGvtewb99DSMkIy16dHy3HFDMVSrIEN6FX/aGyEo+P/93KZKDdeouqnwPw+fcnS2L0XAID1A61s7clTf4MzibVVZCm9LtT6CY5jzB5dQ0EfDS65NkvMhfJlgiCEXNSzODqd77AmsaEPG8Pk9FLPfFCPaFQ7qAqvc2yYcM1mYZg1waNNlAyl9w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:TUxYt4QKNl/eQzuS/0OlrYURsNgurVrAUIKQ7zczM?= Zff7RDOm6uYxbsxzy3RpgwKqj8rYDQtCQycFt5jRt1QU/NtH3n9qUubjdAweg7g2fSn5YgWc5QLJU4jJ3af2LtHXW1cAdC1rPrh/zzvna9Lf6o1VjbeJGq3zU0Nbxg8rZJAJKedBpp6XVAmfcBn+cm/R/JnTFBgJGNICytENthUdY2XaFTsn1rNnJIiFESgnGoEr37WQwrEFraLjhMH+yXOr3bWrA0HIJF/aoKFY46yjHqVQruhwh1yy+z/bPbSP130HSeJ/7uMCnW3LmcbAVF7OdVjowY+0V6brLSnTR0QafpStByXYf6eq+O3SqIzV3h/r4ICSDpT45seObRWK7YX+coO3cJxDQ2xe7g2sp4zH0auUndVGmlZ8CFdVDs7U0zxxo5IKpLOqFW9jMAlKzGQ6SHbLqfngUrWomcgzPd62Z/GrCRaobDaKi9pFH4boCbigOP6dxlD4vjOmaRMx7EBXSAKgxallSHOlRazoPt/BknHBCpq1HZ0ZzaC43PVii8yaIHQyO6Ww9elfvShbe5UDcJELGGeedJng2VWmhqri37YugAN1x7Q2wwqYMfNn8UFU3LbieOGJhtUXWSCuFW4iI/2DqcN0Z7DUmPxgmKIQSwfBJ8LXXxO1CvhoP4gI03mwP5xDIhYRacJkH6DaGxc2UB13I+fNdTNYPEVpCCdCg4IG0ifZSrG3bxo6algMucOnYeliWBhwTlYM9T7Ur5sl12UkCjkwAm/+snricpcI4FjyOY9AWRGwcBWvKed8Oeiae09JmBn56mGX0cZZZ8E4+bjfTtq3OhG7jkLbaEtJtrUhYCIwe0usSFB2CwU7XDJXtmmeOV6kEqxzFI1zeeouqyq2w6Xe3/LPyf21egKFtw30XsnApSUFDKzGCOlCxPSsArogWdCkBHJz5mnKGJLL+f49Ey+FJvBFnLUDWM1S9cLV5AmFvWmw0Ua0VWvH9i21d6MYIy5/1FEbiUENLhC8z04hAgwObPnnnEBBODDPuLNY6gegiyVYyBMvUO3UG0= X-Microsoft-Antispam-Message-Info: h1Bn9PoJwTH2lNIck+qqT/9Jygvps8Bhoke3NAiKgvTuQPWO8fJtwn3m8Q2R9yu8LiTjy9ZWdAPt31ZMoxQ64fpEkf1o3NnkA8VY+JmyT7v9OzbauP60BIu03GREph1X2lrQtoVAzhzaTGgxDesqBr4wfRqBBF+3j8kO7AEQVXHRfCX8eVAu6wovViusc9R9 X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:61j0oySZ0ODqOFf30AZ7UeFTBcSL+vECgzxk/iIv7n1dvV/S8KJ+nIV05jLHlwPGdOCbcAl8HwXfoj1oDX54eeyPdGFOyFcQIaq2WVlTfBEi3ajaDKg4jFWctqmeUqC9uY07kp0pE4vg3IGW/GYmcwX+TS/kb00a3X8cb4AFCtt4jexVENij4NzM+R6pwqXOVibYk5JiU1RctJsO1Cvbu2peLKKaMhPp3QodFpr6pR9/pzO5Slvyi7g+9aP5MK713SZHZ0A0ze8R0tOkzmzor2VejYW08tIro9/4/QG14bmmgTchMdvioJ02pKfiA0Y4UMkvYLYM5I4HieyzzLePfTuAu261nfTjrnp6T6DvdtrY3ryMNm3xSqjK4HvVz1n74rOKasS8M1hY69C51dUXmxPxBBihqi4Ecxz+taND+SYkskLRrjUMhFWwHE5G4/tyFB/pgbTVPdgkK6ZCRaWe/w==; 5:Yr8IM8/WuwK17z2E8eTo6NsTmjC5vP4Y10h1fLuCs83VRHWGBH2i1EepWwtqOpdYFw4P1KjW3qmQDz3+3pdoep3PYCxd3JBJvJHg03gPlLhsevT0aYQMeUj2Yu9eu2J5auZdcwG7MvObEZsb250ntTtzU0cDGnTtBvF0UAK9+Cg=; 24:o2GCQi3qYt+bkApGXZh93/xehikWvtD0cuhw69EuxaM8GNcvGMgI9xoXrWeN+toq2C0c4CullQAwnIsbBmZzlFhMoiPZjw6WVaCYM0hfLO4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:pTOtCUIGC+MIrzE09tfdeSsbcmyQn/4jn8Unhx+heRocCnCpYP98aMz0QGO3Y0piDPflTc7euLea6rbOpBlI17HH9r6WG3+VRsLlHF0h6fthuQOAtOS696z1g/Xb5kcMq5xJYTdK9wpx2YQpKuzn/0qK01puf7IO0/HOsVH9SSoowO4BwlJMv5pCXSuOt/4S7bE/70LpRmseTcef8VTAl/k6whor+QuRWdM0GAE2z0OFkw6suRwLz9/6fRmjwwMl X-MS-Office365-Filtering-Correlation-Id: d6f17c29-27cd-42b8-6c79-08d5a4e89e39 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:33.0005 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d6f17c29-27cd-42b8-6c79-08d5a4e89e39 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215551_652978_9784F915 X-CRM114-Status: GOOD ( 10.01 ) 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.0.78 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 d7aeef9..6c92455 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 7570d12..b677f38 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 34d074e..b72ae16 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -260,6 +260,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 Wed Apr 18 04:55: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: 899889 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="d9E5MBi6"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="uky6OtSn"; 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 40QqcZ11Gqz9rxp for ; Wed, 18 Apr 2018 14:57:50 +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=fkM97PS9jJyn2E+MyexYoGNMqkPU6WRpqlPuSFLbCHk=; b=d9E5MBi6Q5almO Zzql69XGyZSHeXeIoF0ID7k3Iv3P9/Qt1kvIvD4V6Gxo0ulmijwqrQz5ZlKLalT9XsxcKXxI2vcYO SfJmoLR8cda+W12LEqgLiJX190flSGrfzRJPqNebc9ANKEk8sO+0MTdmE7n47QBXQZ91A6dfoOG4Z q82dG62YlA7KP8kWCpfJIMdxai70cLP2loQzzbRlgJP+KhvpeLgWn87M/dulxiVNfPQgBuOok1sG0 4Gp68opv8GAlUa1UjrE6s2ie8VkZYVafo4Yhp58ShvKwAJb6LY9bFWpDiHgGFHEMsdGuY5ZwoCqbg LqkTqnKbv4/DVbTGcgeg==; 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 1f8fA7-0003z3-Qn; Wed, 18 Apr 2018 04:57:43 +0000 Received: from mail-he1eur01on0067.outbound.protection.outlook.com ([104.47.0.67] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8K-00036K-8F for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:55:53 +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=uN6jhGoUshJvkgSNrXPpfgzgFNxUKuDZfLADKR+jgG0=; b=uky6OtSn6ASxvUod/chGwJ9d5zpFu5NLAscuj5S5OR72IUxtstDw9o0gD5RIblmxow1Ve0I9oTilIDLU9LYTeXc1amQ5rUQNJl+JxYgAgHEuUkZ4e6lI3BKSXonlYBtJPdtpA2G1rg4bzoBhlEz8i0VlL3pTBQR1LoGx0Ie4ECg= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:34 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 07/15] mesh: apply channel attributes before running Mesh Date: Tue, 17 Apr 2018 21:55:04 -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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:R7Jr0L29im2KrhhqGo7CJrWbf0KxFs+K7+J01GepG/LzBpL1q2rPTpvgZ07dAZnksHuyzTu216XamVCig2k7KpRUdOWZayO7PN+bIoaQ/8qLQ1fkBdcgHYqhjvjzL8db9y0PJimBTdFZ6gpt9bjR/P30lZmWB7x37s0yGfisSLWLagdYRNmZFQdhtaj6jVFxM4z8M6cuquXR8SuuJXqLZ5/zDSYrDYxUhRpWbkMzIaA2pZwFEynMq+Kwan9AM8Xu; 25:2nkTtHNK8Q63bWt8/XGyxwuBlCvPwo4egvAbVgHT2Mt062XEocqv8pV32eMltThigktt1FkGXjd7nj0KhqtyTKpiSpYRvvBq+fW8w+dtJkBDprkBLKnpjsU6eBuPAhp0elRmLKu7GL1NHIWqYfiYcCPppBaIZPt/6c3NTkHS3n8JXiWsZcr7HP4ABge1slkoRdLUwYMhA8fITqvObaBtsR8g80Jkjz58o68spfhPepjO5fXmFbUtwtoEOI8BQJteT6ZYYdF4kSioa0RSmaPQUrw7ZSRP/eKPPkz92vppmgu/1+A9dqySqLaogfR+cfwOenD/nqpNgaaspUDdpB3BAA==; 31:e0iPMgtelhYD2j4kuezSIoldcIw0an50I8y5I1YnPZ7+saAxvPaB3zHNVGLSFQ+1l0AgkRObdc3+R9wbzsbthgzkjdqt5r11Ic3E5OtgF+8/pzR2wvynwTFAJoW4RAkd34vdkv+Wg9v4qrq1rPJoMTgUDdoMT/bWhQIUj7GIpWyER9gD1kCINoELXxdPMwoHgomxWESR2Q8QvHco/aAr1DiPKmMZrRIMGyCryjEs2Hc= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:ubxEnC/M2bcJiWecQLRICmQwuvB41ujZakJ5SXpEbJrkkl7cdoZy/FMkCDatUYyV19TVdWeEvWlIeDIiHerQcJUuvhp5Edo9Cc4dBERA0KBFisd1F1dQdYQjN2MrrA40WTNq4hWuyimUujr4ZccCIXfZnkdVABpJVsBya42LJqM57s7hgvwwrmPQq9XpYqX2uI5pAV1PbE0nUT+1DkQAQ9EAlPIw+kE3C0HtGNFVxLv7/Jlsjv2M8HG1S48mTgofvwo9OMzluuPZF7W1I3nGLPcKN7xI2spKNVqaSwn2A3PkSzwOHdE5vBLr6vDsdETdwb9bavembhrml16tb4DdlA==; 4:RQ/tMEGXkpFIUtVyuldq2jd5k4wie/wBJKgNXpxbj+vTWXl3K6ZFrnxRCwOan1j34cg5xMQekIq3LPOGVlxR8Rpezl67F0eIrTfnCmzbNOUqwhU8T3M6VDZ5u/lFvmVf9qi3uWuIeiE+mSGs+ybLW3u+8hk4vl85BvhbTmAg3Q2AgQC3hmCM/vF22rSGeV6UBlKtuz8hIc8mheaolkhnjoMdF2WutYPljH212AQhizDBdU1CZcerAYXTqwJaOZra93Oq2h7MfJIo/NtdYfYOfw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:AXpeGA6nTE3qnAEyEA224hdeMTeJvBphcAF9plknf?= SJX60KkwN9bAwI7NG+QZeRy7JWwQeqdiYHeim24hzzz+pq8/65S1A6Yz37Hf+z4CDZQPbBIdA9qwXIs2M0CuCGqf2G41ATw0zGpKXjHtiPW7Cc/1CaEHWZzB/S/tFQDiM0Y7y5iLDTsMqIz0scxXQ5McTY8WF+uWMnnuipbA08FBi4RU0jgmZW4YcSq8pdwnKKFQ+6be/skCKUB8hyZEKNaSY+qKCuxH6HLC0+HHlp7ifVxbyW259V24Nwg7cdli/OimtToav+1Iy+cmYD8oEIPHaQF1918NUlA7UySIvBkAzTolPKreQ9iHNDQFa7sjuagPjkETn4p7f3gXOJZcyVyd3YT4vw0hQmqdREynv+vkI2YTM5p02XhGkzbAGt/IyJ7asjqALeUwYwy4OUff/BeY/BHQIuu/qWP0zhjEhB9Ug5EqjXh1ukqDM8P3g1fXDj/4I4QQRNYxrF5hcABkwZTBx0kJ1KdR0pDtaHyQibcqrkD28X7aArck9AKNkIoO8ys7rTIAi8HjwHe+g/bUSZEBpjhtTjX+JY+QQrDuosaC9z6vXKUGkkgcR0eSUS9TzNb0b234ulN3k83VX3DH/oOUPXwCUFZAW5GfjXa+ue5Wp/yXluPVXxgGCmbBYGzzEqkFtwWmGart1UCl0vXr7yuFjUETkQF/uEw74MZI+fWyVjDMbsjYv2a0yd5RC37usUU4iA39NeG45Y1lptGAZEewlLw3Q34gy056Fwx7nZXTxVORBfH7Pitn0nrkQTsq/al251YnT53yr/Z5lTvJTkHp8svgrYiuAkKiNCPpMKzYKzfg5cgQ3tFJ+Wb87jsGcg7M99R62lyKLv43Ae+YxKH0wUfSkRYxCgJnEyO0lXd8SP+q9bP6iwp7LhvbnAHGfZe6oIEsb7ViQpOEoSoTBw2uteGNm+/NG5Ovm4PikQJPMW6oJRnhfwYNXkzM0C0zpfUbPbOxYe92dleXOPc5RO2G281n4SBpnp2KiQr3N/LnWuy5zwMGnWT5NbRgPJsv8o= X-Microsoft-Antispam-Message-Info: XnkxHOzBzc7GRicUNKa5q3faLRX86vkGf2gND0nW08EyqxsLTGPFOIhnQkNJnf/Sam8xjvG6q9R2MLV0RAjUWKFjy1vY9mtUtgB7JtMcb26W1mOlF07NtLz4//cw2ghsGcyU7qY5sLx3vVMXFF6lPZd7gzK4WPXL8SWzXSdQ8513oTP2xinNUgzBpTbKVT+0 X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:7jIx9Wx19ZmUnX4fvpDxRLrSCzjJjCWIFgsYlJI2MGjjQgG/K9/hJJNDehR/JvtfW9kCjsUPMAIkOGuXunTZOegMeaPT48v1sByZH20LU/CeMmVsHwzfUWFUijC5CNqzdPKRALI8yrGoHObp0oEzoZZg62Feagyck8t5trEAlpK0jpPCVuqQREV4DNEJB7POuaaemA+cOaatjp2Eanl70oJs4cR47MQG4Wf9NIhdiQ1cXWwhWpO3+zFhUEiqjSqvOOwrLBV0tVHD9AQJ3ijM/jSx0xZ3Yytis4j8FBX99OJeBKy/q/DUkkbrU/zNErJc0onyDu0t/H3lLPNvTYgyS99WHCUNuki80KWEKhiW4W0Yg0RBV45k40C8jZr56DByYqJo9j9GAyE8v9yzRIK5cmlUADBudRztZQjMCKwdR9/OIAANZVL56Ki7EIS34cqryNBXGHnyvDwf0+kU+LbQKw==; 5:DBLf+hQxcb91/nwLcCYRAPMFpfAdAHVs/SflUC1tvVwjM3wUTn6/15mFiAwAqby9CpfKDFaJ9zV+iZpstLBvfUsmEgsiy7THZww+QHNY9dTu+b4ViABJlbpu2IGK1P9xSbGBRyq/FCPzfq3p4SL5x+Outudp/JPIAVPbkhkRPlU=; 24:QwkoBdFcLK6I3ftWc/T0Np5DlRp4kUTbi7YTZViRlrNGrCnyvMePFrWN0JhM5ScAwR9p50VP4cALwTJR+X+f2Mh84pR/DvDz0PlveWJAGSw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:n9MTZKA16RbCoM8yCGLfMy9ecKi1vLZigH5DvvyolLdAEn54O9xsX80VgzZwS4E4z2l6n5qVpfaEUWGL10YIMy5vvB38WxX0uw136jH37lzD4D9KImEOtHIJ4y7K6+Cx3Tp2sBEmdAzZaW9r+zz5OKNzpiMoSX/zH4ZAWsNgOc/4TBWQR3OWj8TER27Bqpfjm1s9aYhTwnpQ8ZV5+m3jqYW97kCNMybscLCeirZtLtUDZAtCa+9BZbLyBEE5fYaZ X-MS-Office365-Filtering-Correlation-Id: d233df6f-2fe7-4a5e-17fa-08d5a4e89ee5 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:34.1256 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d233df6f-2fe7-4a5e-17fa-08d5a4e89ee5 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215552_339536_DBE4D3C8 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.0.67 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 b72ae16..69f670b 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -336,6 +336,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"); @@ -347,8 +349,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 Wed Apr 18 04:55: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: 899891 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="d4w9JF/m"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="iEN8WCjD"; 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 40QqdN0tPbz9rxp for ; Wed, 18 Apr 2018 14:58:32 +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=E5ILxO9M1FFyeEDC2u82nnHVcWVv1Wgz0ZEjKsPtYGs=; b=d4w9JF/mTCO3FT z7urz75eVFH9o+WSvkJNMXZJkZDw13vB5OH5BePclzN8BMgEwB+lPv5KXnfqkYICGvEjgRArfszJp 0SktBsfyt8brIC0Vy6+fBdYojhViP7YXFVlRTB1f3M560iqzpGjzT2BrI/lZtUgBh01u72knCkd/6 gtkXuQeOOiEprsK8mTMui8dnd5/AAVJ4cFDkifaOGxjYrMg8XcOzBi6Z9g1Kqb4wPN9iqI//i7ulE jF11gpIljpzIgKUvl3bp9v7QTY1jaxskJsh7xTWUFCu/3RaYp1+745B9se4E2xBTNZZoqy5cI46J5 Y4fBTaph7odSSFOiI9Aw==; 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 1f8fAn-0004Iz-6D; Wed, 18 Apr 2018 04:58:25 +0000 Received: from mail-he1eur01on0078.outbound.protection.outlook.com ([104.47.0.78] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8L-00035w-T7 for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:55: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=ZQVHeymts/80/m5HV6wdiGzQtUAeQ4kdxEkUW1ozr1A=; b=iEN8WCjDzLuE+zB7ZEFmvLwINU0l5qi1YzmZYQ83pC0ICgQCci7hWEJhvbbLhj6IMLi+Vc+MoJkQZd5DZ6xaNcHJ6H2LgtKOBPpkuTLd8Vc6rsa3EVJEtqkhjCEiAmBnTA6fmmeD4OZY+5prxx4yFfa651JMFMIxfBQN7ZkQJnE= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:35 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 08/15] mesh: set interface type to mesh before setting interface Date: Tue, 17 Apr 2018 21:55:05 -0700 Message-Id: <9a70e94052f2a7739739b04ae1ccaa9660daa4c8.1524027184.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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:4kmdxQeqUa6p07frCCywLjzAfAs96lJMEG5Jf1jGz+1bPd2E6XDAT1l3SRef3juQNqRdawQ/5QFndT37gkhQ2/KYVpmEXRoru/6HruxPBrtIgUTJLsxL5YBOLVcXUK4CPFmF8q+ZHNTL6f4cbGH/vaC9B0IvKFYCPSDNvslCOCyqAYei0mwRySqt17dYCUnt8bcinprZWnioTXn0LZTtr3gdHcYExbysLJJ9yl9cUFeWVksMrv9gFE++H3Bf1eat; 25:I2c7eK4PHdFUFO/k0W4oVXIGc19zvpARvquseE0FK982yVjP8nQq52NxACBeaR4GlvwVa11p/105i4VKO76XqhscxnKrM5Jymy+z3TnH85dxBcZjjXHqFU4UNCNfF8gBI/nA4XwnqijJzzjUq8uU1qbtPZVSSEnGFAvAPSdGZlFbQWkdFRIQuqpe9u58beKFE/4WQILGNoUirBzZXXOh9KoHQoeEWNEBKf+VWclVu6L8vsaiPhVSJ1HQc2Z2Z0ifthyfpbLGTwBtnEFwHtwRoh+m3/0hVExTZMMxbCCWmVdkXCZbYvvTfODQn18TFLSZzGLSmOc1/gQ86/5MwzzpNg==; 31:LOjlSoL1viXmo7wDLpfTxgQ6XkqThPYEL0Jfe4wiC3Z9cjd+Uf4Znnpb2aQtEadIx70LNPRsGDPnrWgUXjpZDyFk2PH2NhEHuF1G+6rqg03FFECBWsixcGw5VVUjOmPLtgudYlPVQZbkLrEYFovlpLUZso3pBodvK8nKt87HwUcVB4xk6dkf9osTrOXgvuwdmSrrJ+dlTvKPhIB85ew2CPkDDa3NHUUstP/UJwq8SMw= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:hOXWcAq8A5+6JftdequhG2c/Dw2CXt7MIIF3CCbA0tAlAh6QRTkDg0P2hSxGKMN1Hs9Jqhtii2F+b8mz/GyRGH0z/uzoKSgs4tg8OB4CWF9QDcWTJZ6iQlO2sVkVLM2QTeDqkCjw8WKDbfvn4bBsCzZnHFRbLWyxcKsxUj75QygI5lQSEAgkj3xVFCCzFVaY6tl/7MZ5BgGwPJKXQ1Qh+qPkV+51RkzzNU05hZfHF0ViLIiFUK57uB7+VuFtcXkAmvR7PAVa2k99NnoZ99QTav3aNQDndu5uXGvoNExgzXKM3Q8vGSzQ9rD9W90mWefkiA9+M4Jv2I7HfHrg8mHzEQ==; 4:nb9+tCBPiuNMihCepUGEIN4NVHOsN84DjAF3HGNZx4n6dst3/QnRdufY+WgEBpfFIUvmIJau0wCAtAuiP/lHspBxdsv3PV7jpAAHRUiaEmD9IjwxceX8TYkQjElbVAO2N6YN5tScgkxWomIYMMVhzWF3FU+3H0zG/Xnh1XIktkExwVPW1qahI7ikAHwikAX/H0UGeglxoFPTB1AOjaELsxJWbGMSM+hdq/C+5HBAcIKSVp/Y9+4k1ttvNaj6I+2l23+6TW211n6nXndJte9tFg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:nm9Xu9wKyoH0yecSVsrtF68ZdbOjKJa53WOUZThkD?= 7lYryUE8HQ+P1NWwob37QcDlaJpNB7mzx9TpsQX6niajFEO2o9sUHSPW/drDcuBFv1ryVZcE2y5daSi8h7CE0m5i7Y2fkCoB9c5nJtR+wO5rfN7g/HVi9mAG0p2w5U8zcJdQuaeNd4q7jOLJ0SAmgQJB84S4PEro7AVZ+sVbdCN2Siqv3pc6aYtPekmXkW00d/KpbCH/LyeN82oT/ABYDtBOewSeczrOdVvcjmkNSihaO7a67bMNYuAf/oaN+uy/WbrFYn+j1AR8riaNhtd3PCeSeUIfWCfr1vOwo49Mnk7DaNF4pKh1YbXdF1AmGT5h7ImefJNm/u2kgyUv+dhSpYqRvkalFwRrC5Z4Pr+l/Sbdfpq3vOOTwRUQu3wpVlE5wQX7glJpZ3rH1aV6t1E7hTaJYexRWxP06/aByECd8IAfK25FZcpTQv5uB3mAqv2EcB0aOIw8dLnDKuuy6qXC5E6FTTnrpMtk9NyQDXQGQWsq7ZWss0I7yISlQcmH/vHXmuet55/6OYQ9mCgINe0rHeFRX2tMu9h7o5ZE9KFNjNun2eIB3d5p45pGOWZoz2u1OhtufbTfw5IwHXZXQaR4NkUJy9OhRDbCwPnHonN1+SkgxywwrV3OFTs9Ikjz/wCG71E+D93x0EcYPsBK0eY+jXokJ9Kctib5CjVE1TqATxsCsivYyOjGpjM05dELAErKVaDzUnqMd9R1yMArFnNTopK86LziQRzqL5IBY83Ms2+tLDU7UCWA2l5sFTIfY4AwJE4ZoQKuA3DqpEEfAFLJBpceJlqYYEXPv+3eSRFPBICAhn74SBPknEmRsZR7daxH61NFJQmEIPmt/ArZrFrFzIoWkR05gs9fpc/0bD/qDq81ja3SJFtStwgM5DL/hWtNjk8/Hk2ryDevwXp5b27dpXXvJTd4anNK8geI7yUj2CcWy05bwXFizwDCDsmihkYclJNWklnuioanIUtAPjo3TSC71Io8HOYkHAKjHKIsLlse+lQkCb2MUYPbXgPbd6praE= X-Microsoft-Antispam-Message-Info: MRwexq7DwQ+VsWe2Ssd5BH05GePmb/MfBaWpUND+FKCm85viRWjORs0SlB/NaV0HkTs9O8sX5fO9PP+gBZ8LlivTUGgFtGkxERvYFoAbfizFOI7Lhqy82pjbwDJmE+3vbdBAecao6YNUQFblACA2jp6nXzdyPebLunJnTB82B2d8OZsi4WauabJOOa+ubKez X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:/TfRsYgpKbyf1OSGdXsWR1pre9MqmeT/nVt5bG95fwihtGjM/2TXtSqwnlwUbzkhRITgt1YDUGf7Ur9D89DzkasTJKyOfWTbiK7SQ2qxi2bJ6pFY6TZ7y2IMx9nU9lATwn4eM6GnOor9dGSjjAYWDyBBmIGrzt8IkQh9u4H9V5G7a53e0LXtxddVcUoTXzFjzEZpbvfbLegaaeqNl6D+Zclk+F3I7EckulLitQRJE1lAMwKjlXW0IZf40Ae3yfqtUBHc9nbNV7dFRklqXkgBWzYBzSCKhydqQhVjKCzu76wT7+oWCvA+BP9pJpwEjqLlZYMLbDPNtZ71rFxEdC3A9UTTB4I75n0cSX/PA3cPi14F4zUuaikEFl85V6OtiRND5d1YoTUgQcbQwJVcLHBdKt0qj1dbEuS0vo+gcJiBqI+jM3vCcZfXhDDU+5oivnXDgneJwfVStP8q8dHAv8TUdQ==; 5:1v8Wwx7Gqe1TZ33nAtLvR3jeFqzXhm0sr4W1T3Y/eQlXaqgxw1ONRvz7tte3eiP66H4z8e81JB77WRAnxVqsmR6oXlrukAB7Wi0J73GMf3KUnbo8UIRUEkRYe45iBJqCiQKmuenHmtVvY7JzJn8ax+LwpUPagSLX+VJdXoiAxNw=; 24:BPpw2E9ln7MJCNWrow4dWZ/ij/aexxl1MyKTwsVE7W5aYbpl3w24C46hlq9rugnmnY6TDCJ756+0KnrcXDnVZTJu669ukWkK5FGDDnkVhBQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:K+aOKnvCbDNHQc/uRTb/VmaXeIq68GGXaXeehIQtsHC74+O3uIAtrzlmTaZDqx/LH573BFmHD2e+oBO+sroiVc2rK79G2GbI0K3UZaRwYLkK5Vr6YJ7gUNq3wDmvbBVgUSr7zGOK0EclZYP3vxKZtLdyzM+1yWxXfhnQIF2fASa8AqOe4GZS54JdG2k/xA8leB7MQXTMvnoQys3UHRq+JLmf2g/QAoXUikCXzAJHsgpSPUEns69zgdBfWKLZm3lc X-MS-Office365-Filtering-Correlation-Id: 5d915914-77e2-43e6-eaad-08d5a4e89f97 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:35.2975 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5d915914-77e2-43e6-eaad-08d5a4e89f97 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215553_964174_86E465A2 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.0.78 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 69f670b..f2752de 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -338,17 +338,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 Wed Apr 18 04:55: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: 899892 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="oMbM3CF1"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="qyQTqUJW"; 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 40Qqdm1PnBz9rxp for ; Wed, 18 Apr 2018 14:58:52 +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=TOLaQ+rIB9NiU90wemE/4JWR79GhByuprfCUFGqTZak=; b=oMbM3CF1W/AgzX FDok4bcEaSvO7meJP8c00vI6taKJrOq/hsA/08JJ9l28LyNlWEmla6TPz83f5ZQLDn5vjzC+DdKJj R+eoerauhuRXoqZrocMrdBYldI1DqTp7rwtlDcew9sf+xsrH/tiS35dpvoZaCS9rmwj6N6Lj/2pWF /3zCdB1AQ3RYyIfkgVPLafkPLoeb4hzbSvOvlOZ3kHmoU19N9Bmgb54YzL2ZSnxovst8IrPKlivQ6 TxyYQqWgT3/Lj0AzHZ2LoT0OZ+DCsxKRbaacQIHdefYcuL1cteacwHu2CcB8evgACaFLNV6oDQ+KJ LYtM1SfLCZ/XMVQjFAnA==; 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 1f8fB6-0004RH-On; Wed, 18 Apr 2018 04:58:44 +0000 Received: from mail-he1eur01on0067.outbound.protection.outlook.com ([104.47.0.67] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8M-00036K-BY for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:55:56 +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=nM3S8ao9vAWyvRIOH3E6cpJNxPe74ct0ORNS7lLMbrg=; b=qyQTqUJWtTBg9oWtgZL/jZzW7Iq9CrLLoy30dL/pHAjKOB1G1nqKa5vyXKEV+jVHUsgiumgi4/dPTuVVsRNYaDnTmWgK9lU55gmNnOxyCrAvUwXEh1MHogXRcnFcvP+U0kGhFPmq8ZTYjX4bhx65zRGjbTm5pPj3ZmTXRUBs8mQ= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:36 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 09/15] mesh: set mesh center frequency Date: Tue, 17 Apr 2018 21:55: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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:aZHawCYaROvFhByJxB3x4OA364djs5sAyxSq6VB6I9svGL0bJOih8NhXQ2pVq4YfHm6tWP732+HPST8gT56hPTQR6VTowC6Ore3NShBGIBnvXgzZm+yRgNn+YjklIVVufwcxwb0WtPHziusytdDShKzgyg2W84Fi9YHLxfcmKR+NNzsOQ37217OdC4UktXXXuoYqXrbezM9YL9OGIWat22ZYU0GYGZCMXNmJ8VzSmJOKrAIPjNFkdpUvcYbZsRQp; 25:vAUq5KsSuR0njrgnZrA++Mh+nHu3PTCGq1x+SH6VADtyxfLkWSCtYqPhE/blHGH5MxhgTbOs+J37sazEqC0AWqEf+sdbnGONeDg9NWf77dTHeXruuiIUEcyEIqk1hFbOLpRzNiZx2BhoiWwHWdLJLbk8jc9PohfZxgYnJjMc1quaVteaInHH3/Nb1DxZXvV6DGUJOG1xTiQ8hko+Ur+gOgLMVg+cvEPi65aZVbipC5CXMDvppYqw6dfkOOOydgMa5BMtNtUBqHDvStzf3D8fE/uDRqP5mfyPnCtrj7q1X6N4UFFink0q0NBY1W+n6tZ6qv30gYhuiCFGmgJaFHFOTw==; 31:/X33rd6Y2nTbXRSDnMuFcWAsz2Xiw2TbXCFkYul/0XSBiwWgUeEjES4mAvNrkXBMK4szgcXuAis8gaNSkRDJ/v+8WrgyMibh0dRl9ZVsssh7+nn3JWAZYNXyj8FyfPTHDot143BN/m3OLN8d9qokcQk8thtG5Bkcm6n83Hdhi2k05GUlkOdt1fNqfGDU1aDlA/jvP/55mMOSp4cT5GfNQ2eQ8ijZsIDQUBYM97E7Ad8= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:PWTWhR89PL4nlcQ8ScRiom2jfeX+OuhRhFD7DGFFwhMvT3EGs/iNQC0xH0RN32GbyBnPjYMgMeTq74kIrPZrmtMCDzBh+Ppz2U3x8W9OGroYf1j3oWByvU9vKu6J/M6nNGomXy87uDCW1uieQQ+ogUtjdIPH2dEBM35ZnNSNxegNSgw3ld8nL8GOzFPtYPfjTAST8I9sW6CpGDtfOdcQAUnWOjEiuY1dB+mbtZBV7ZF5uMf/dXAd0u75QIqMRqNNIj6Ymk2HbvtJs0vPQ+q+jciTFIqZcpkAloFw8TjRMutL9XOjQj1uHvs+AKv5v0leghI6P8li82XoGsyE8pFomw==; 4:aHSZuz4uSfwAgtez4LNWW3/H/8YT+GAH6auOPFrwB0Jza47XsNGbN7ib+jPj7gGqTr8A7QRchcxIymRPU7svLpLMuacJ6aPAwZrEXSjSQdCm5VFUiCqZ5aPFszGRqyjxaqNK4TIvqXdvNxwJpYAefXb0BvwtRbP1QARSsdv30vqME/0RuW7JLTqXmveJ2uea9msnbn5EPgdr2F44jwiFM4fUDRcLa/EwB8kGaO1mhxAVbxtY16qmNFZ/6NlPRlQN+kufPX6ASQdeBbCwG1Yw/A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:ZVYZPzxjvIIYOVrVAWEkZz60816asOvfRMENwoShU?= GKb5fyx17AUmkpBxs/q6lB5GSPsa4yZE7zKiAmMeCrW6e/WKzjbYHCXqUrWfT4NdOhl3S8Cql1xmlODcVISDWMg+FD/Zyvz+NSzPiY6blpwNUWgRn3NcFaVWI9DCg/y4JxKIyFslxOBFE/ZOKpb1ItSCvon/zjD2Zp/xd4HKVWpLsrgXPhF6erzbrEWvZ/f0Rqg2QeloZOK17GIjruNYSxMMWFbaDsHO4laI+A50hex9NUD8cxpGOBZ5VyI7L7VAKzGWBt17FqdKmInSBdKJPgmXLy9yFqKEKk/z/WZvJ+m3UOBymKEyAjXRirJ31dOCzXwTQ5Rej08RgulmGb1y+NAgQ3yM0dtXI22kr50tID3yy3IuHkB3hiffEAlw6+m2iKIXrfERRHoX/QMCeeUY/jRc72XnXMerQpa6f46rnEDPx97K6BJHjmQ2A5s0smH086JucG2nY8z/wEIZTz0UvHt0xEI+Ar3LVJaqi22i8ZYX3Q8zcPKZ4BglDb1J9HpbCXw51bl6TX9ZqQJL8l9fgEtBDWpK+iDfYyNEL3SRQqZpObl84NcOxLacfQmbOx9vyliEXP+tkfsizOjpZ1GQ5ZNyu9yJuMJQPv1QxWJOqhNAT5qdsq0kyL/Y9csOpHHhJsEB6TEbuxZ+DlOVBShgSmHRsUU2Qv6LqTiBPR0ja7wpIguUvYiEjx0Odjmihj0Fy+xaarbO0A7jAM9dL/YxZ+yhach0WzOPumz/Q0xgzYU3CZQVMhFjt6TH4KYSOsZWcDFFWM7zqhQaYtwJgS9Fth/EhOCbhSa7yunOW2N0t1Zy0RAGN94Xx2L7ARvGlOlrTPdOONiXa5ezoTs2E1EXTq5lFC694bodXrM51PvFa/Kit5r/C5WLLU2dXqoxggGpSCoBxVi+kuhKlzalhcL/kifxfx5VDCGfiNuqyMJLcA0S/PJ41A4T7+G/o+VJZbivgMZ4ppeHF+Qv1yr4s4AeXzyU3+TUd2fX094dljcSUKvjmwbG8Y4rb65mcuMCtQKs1w= X-Microsoft-Antispam-Message-Info: ogXAaFkA1nARKCuI6iUIGN/WjwTug+HIGH+YhD0DW1wsAl50pUG1tBoUHhrKi2w4Jx4xwc+Lg0jw2/MylUVHcywJtsAGmePuMR00jiDH/wnEXwtAcNQPHX9QshiwPDD+0e6T6y8Nvb8IxJpRqQO4OxMcYvoUgHUWj8OTKnAu+C9kvELYJt2OG4iODSE1Pq0f X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:1eWtvIMC9ioaHVEUXjCZfbpR05mJql2LyID2lu8+htA6gmjtBge1ImaAEvSnXznaAfRCG8FvBZhf3BjySSkxRh5UahgKY5kiFsKmEkCXvd390Fqlcg1yZ2fDw6LpGhoeZCFdDVf/sRIG5zRmasmhY+1NRSoDXnBXQm7lvXAN61BG4TaEZxfK8X/aZNG54JO2JRgNM5T48aAx8BqLzrykA7LYaGEzX7/Nb2z6SKPUsaTt7wj9szw1hpbASTeernKUjZfiQjhR/eaSXTfM1VzK0jdx63K12bQP528fiYeSfcA/49Ye52zcIhgbwHl76tWO6vrYhjBq3Kh9sS6cd539imxfNUAAOWQbYkekq149Ox+L6+mk6M3K/u60hVxBcE7wr48iWm5fvDqUfn2+inGGFbDz7wRI8nyTwkaGkOuJmETL8LYBv99xOrlpl7+RDR4uKCxz9b6/S7G8XCeXszhjyA==; 5:iu2pWBSdB40QdNgtZLiCZUSQktG4pu/AF+iKckRS1S2nhyPf3pbr2h3dUBI7v5EKSBib8cHP9LwAQL2lxy98Jq+eCNw589yRqOOfH2LKODIgqJUhH+lNicBNsHjFCWe81tQPQDPZ4xVW9UhzK+sobFsGP3n/dSUFailgAwttYec=; 24:sR4WuKwNanrCkTqhwWpQKjIqOEQh/qAeveNih+Ipg5HmONpxO3Q+dMjyjuJ7DIDUPbexeXaITN6TXGgzdM1dbUjzvMXJj9oOnONlUobb4Fs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:sDaCIBx6sft7H1U5q+UgrVpGLCMoBxNkx2oW9Zpv/n3T1OYSaaE9N6EzZc/NWsdMf5tV9dVxybgT4YdUaKngvWz+gZ2royWohCWHtgczt7Vi8Md+mFta+3hmDCzcOdgyVKeCFQRz9JlWdIfImrpWH5ZQN919DnUCI/EA9n2MgYiDg12SMV5q5LLpYW/yQAFrVMPUy1QJhTlTLQvoWE/Rpq7yy67S3SXTkwaXjZUkPQcNRbrVguG3YfWwV2ZgCIrL X-MS-Office365-Filtering-Correlation-Id: 3b82176f-218d-4679-1fb4-08d5a4e8a04d X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:36.4851 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b82176f-218d-4679-1fb4-08d5a4e8a04d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215554_460320_28B7570E X-CRM114-Status: UNSURE ( 8.22 ) 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.0.67 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 f2752de..f552c8d 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -455,6 +455,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 Wed Apr 18 04:55: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: 899894 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="fhT99Oqt"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="rd4hAyA0"; 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 40Qqfc48gWz9rxp for ; Wed, 18 Apr 2018 14:59:36 +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=b8H3arFUBJL7Enhf9imULedI2RFy8wRr8HWkZyQMclM=; b=fhT99OqtvM5M0x W5V3vnynQU29UBRQtQSBZ2c/TUHGkpS2g2zx3fW92MowicVe24d2Zag1iyQ8aZTdep6Hr7DICqgVQ FFfR2hwRHgoFc6eefREQl0UH0vgC8eGwFafzZUiSJbX4ejehAoffwUTk+EQV3usDqRm9RhkrlzRSS G742Lw7IpzNkAH8wfGzoIUSo8dLmP3hdavlgiadzNMwHn0ys8IjqkXvvyWZBRdm225WNBju+brT9P syf5/4ydeQ4eLDDuq0fec7DJbP0xodediuGwzeZ+mEhI7kR6dSWRcSMeq32weTRQFSKbcyb634f9o v7EBGYSZX8250JKsOLmw==; 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 1f8fBq-0004nT-LO; Wed, 18 Apr 2018 04:59:30 +0000 Received: from mail-he1eur01on0078.outbound.protection.outlook.com ([104.47.0.78] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8N-00035w-UN for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:55: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=y5OVWx1Ufq+NtWLFUouqd3H0futtkkPblx0x2qwBcx4=; b=rd4hAyA0ARmhw6Vb61f8EKLTXDcts7r48P7OQin6U4ac3a70YL9yGbusY5ZWqe2peukfve6gpky6ubWulCp2DCyE0C3mcFD1pByXnYSbAGaXrN3J40N7VONiyXlJjgMP5ncol0jD24zUS6/KLJ/lRUiNr1vKZUOPxlUXpI34azY= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:37 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 10/15] mesh: consider mesh interface on dfs event handler Date: Tue, 17 Apr 2018 21:55:07 -0700 Message-Id: <76be0d5e6aa2a4bbc3afb1ffa2810b4a5a470c84.1524027184.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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:qrmPm9v7zkRcJNP071aMGiFd5VxdP5sKKDa1xE6SXe9dtEnPiu0qRO8HaDnNoR5gSXLFeJUyzVX0ZuSIw0zmersSaHM+T+fSbG2JoA+hCJ8M7GCQ40TvCqXHyM4fELA51cHtYLSvnrGylJOf5NAo9lduGJ8bYN2VpNFZBYXLcvvuCWkU1zl65zOLdaD42wxMY4mIXhD22nbHnIyLk5bp1qnQNk+U2AUZITxwxhBM9fXcVkiVTNcGYECxmkyPlqfZ; 25:q7HI9/PLswvAvo1OLGHFt/+ffQOm3l8iq/+3Aiay/Du9z5xZNrp26yvcAuG+ksHjibmsUu63ovsvL/+kJk8zc6C+a/hie0FNRF8UcB+fEMao1wWu4p8IO2WJSoBFmrUa/2vwLbQXV5fYG/XNNmAStm99uxTWJP+BsIbRwI3sY3l/JuS2OZYfqnWC+RFiepoumLslbXHhCZOuKRO261tZiX8pBa0jaJtf5K6woW/il1hRZOl0GjXSTB8EKpH2HheQsRYAW1CLpZMUbzdkltBeC071Zvfp0+UDmMK/TR0OtBCyteguZqk8cGB8LiSk+kYkJEUy9YodcPFcg04/JRMWiA==; 31:FlzXA6BjTnAR/9Jw/IxstSaVdxOeVHd1ttL4tgFum/P7zuBCXs7qqJV5HpuVN2zvQFeIms3qVcEE8sLivzfb/6gpkZ6MMNQjMNS6oLEQETVAz4XjIAOSVF5OSKeSMBXTu27qbtg/9Kyv3ipdrsxvrbWiVjMEp+TBotLcPtwD7dKSl+1zBXcNJNpUaHSpekDyIX0VHnQ8KtjSUTwmEI/191jDQaLGNuEabVUgMyOUetM= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:Yv5M60otkOVvKEptx30o4wLs/x6iDiCJhqLrj0CIblsAF9cowQhq8sez7xOzwkStkPnUdFFQUFTs+akbqrnaYKUpH6HiOrNfCj91nSfrzqHHhuIIm0Ol/SiAKDzqNq/2qyCtInSy8vPb6vMKbAe22KeYOjsGHZm4KHi4QHbWBJ9LoTVO0PgHWlkHvn7InNe+mtzVBvQ/keoS7R5o12NWii90phVBJG2ldPZSqf3fm8bd10EyQDc+Zq6BaZmvFj30SXkC7Z9JSnQdjI8DGrM/raCxgQDcNTOm5HFaWsb+a5MfvQbWre2zo35d32xCB2LStyYIIOBEO1He5nv1JpQzQA==; 4:ri4SGvK6e06fC2j39PwmetfPinQcufOKeJPPwRi3h5EPXI7MfUU5esWlVsCjXF2l60XvJD2bfMz7YB7kwR/YE3ZnLWtO9fXVLDl5Ra3yEhq22uUovfW5BLAf9Tz/lhDBKPpBIYfcu0rgxyC5vR3zygwc4gDXmx6YJZCf5SJdhCwu1zzL8/RZPneiJXnd7lCfFg/Reu5rzFBjwjBy4tgClMXADzgZlUOFh+MkmDu4fLcN8zuBfpHmv0IL1NTyHYhJhg8uQrSXWoQVLA+k/Ixl0A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:875W5ztc4WiNGW9u4O6W7r+KXRg2PkuRag1thnBJ/?= hW5IGBrHLy+eqlBefV5M5ypjb5ePMvb+pv60PbVin58Gj//4rdCTwu+Kg4BLry8dIUX91fvOFkW4DPErOho0m9Fl+hmBwp6m/MycksAgiwK9IjQy1qRX1Vcspng0atbVaKtEnFm6AgXoT5UsZpXkOUVqHHNIPdC9BqdhGp43Uv/OJGjeSxX0Qc9uliixYg8xmzrwvsNLRfxEuoWNH9nkoM+Ip/n+jGFHJ7GyYV2gMOo87QwqPVEpdS3fnj1mwScL1a7CqFRP39PFuQQ2m8B8PKBBGzmVEJ6q//bXMAHtwrvraIeW6FKIqXeuMZzsTk2f9KXfUB5w8Z8dzjdMAXFUczI+7hjOtmzsvoeuEE5DIYxl1WY2cKZwdug/WVX+355KK7ugLtbFJhJYDa/YHvemZTCr+24w/ZCfYLSOJnZagdOaZLye2bvxjDG7WdBrzC6hcx4YOp3sjFChRaOyYZrBJQlbnhvTI+2gFynopgLeEkCk0wXtjGIphKxo60gqHL+ZOxNlxxjyas2YvxSYp48GnUT+H1O+nRET5K+rkxYSp8Rz3kf7vAW41CTHEflGTKsX28c2A+y4hSLyuuBUp6f22ZXWrpjb2W0MIW9KNCoA0E+dbFnBrVu86CziFbtBmpT6gfWt2XxAX/JHTn5ToRx2N0JatFNqZJ3uBuKfIwbtl0EcsVNxMP0XClenoXY7tGVVYY5P4xSi5pqSdLIVM9qwSx12v2KP5vdL4KCcI1YJlEPv6niOyNH/J9TINDH+qiMD8hHS0fuN9b47i+TyozGWcVgZ+1DXJ/DRdqHwRklAbkMwXNbRvdfXnNR2WdN1vqnJJJEAyUQJ0kNzwcPGHRq7t+A3yg4PIzDNu0HwaoWpK64ZXfQw+4eBcIkEdhnpNn95MM+rSxwV9mquVIXIIeaFwGwTde6O5J+CwXGQuxRSWavvlX3EHjx2v6TWg1wLa+66JWFO0Pz0QA0ENABv3MBblYp5eDyB8tqyRhR0mGQh2lVliqtp7ICkHWMGSP9NXWgFUI= X-Microsoft-Antispam-Message-Info: SG5I7qA9n+nBRJEKHyaDQj3Z170DAQxDFK9HkZ8anbY7xyKXq0WROPmPhwMwmxcwiGII3XOFyxkIJNVBN8jqMwY+lVF56IlQs9xyFCzAI7kCrDANL6KIwzhseo8nz8D/dA8aRG73KVD4MjUWDGlJabiamso4uUoSSoRlVJH1GdtcnsqZUydjvjk/mY17DXbj X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:0SrbhkXyJ4gq9w1b71zZneXdT5fly5Bf/yNWR3hkyxbwM7rypWgvxCrZ3cbo2Jx7LdbUmrtMdFeCMH3xu5Xqit/kc3tudekCg6EFMIUl0S+YElMazUHiHJFnjow7gFqrKexR4WbN0pVJRwyyqIWsXEjFIFTbo5PRdm1SPJy5/opSysAaEtKok4cPb8e+1gZhIiXIEROokulboxdm0rf6XpEA8WZWFSyLClykkEIRH+CVrc58ochM12aejWHptr/WjKHKdGVOOLircu7FQv2vZmNyIrj0j5bMMpQU4SZwn3SSMrFYaVxUb+mwp7skN8bsBb9p7igbDd1/frpEp83bTJsoW6Ud56EsvIRYAYQ4pyrBfAPBvmS41fOz1wcEoitUYjuBbKjzt0fVrFKs5RtrfY2P2kc0CdJoM4tbVO8AFJtEGzc7FLBywhVVK21jDyIB53peuO4mjWduAe888SHafA==; 5:Q9JWCuUdE0hkonHL5cFAN3RN2qH5qX732l0fvq9tpxZxpGXvgrPfq6EZsV9BqVUjh4PlQqOHirJxLAG4Gi4y/qzseLb443cnonXIujV9DhP04ujpf8QM+G66dU11otnl7P8ap8cXJtxFowA74o8xGndvBE6f9rqLaL8YLXtW0TI=; 24:InZQYjV0LUl4A0x4cVdjwEXIDJ2vkXhDrtuXG4mI9KiNLT5t4VJceXimHG+Mc1mR/JYPKvrOwiYU1nvqfXlYA2YWUmNRMEqMTieF9l8B6to= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:VNgthfhgTKhkgIlmEFLZK6tkDQrZWJ8eFzhJbRUlHZ0iCPYc6Yt3FLNtpButAUSDJUZRklVgG+VaLZn8yf5P/iECFZog1C//qs6hd9TbnjNennY554eiPvYqmyM3GiA5uF0ALA1aijvgAf2CfejlYCxgKCwkk6Pc+ikHccaniZLmAolO9+xRBTY96+XJlVoLOtH4rgCQyNC+ak25TulNJepr88vjq8r4ggmMC8QXh+3PcWqXZ1bHVWT5lyhhWAwF X-MS-Office365-Filtering-Correlation-Id: 6035a94d-3331-4f2b-dd3d-08d5a4e8a12a X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:37.9382 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6035a94d-3331-4f2b-dd3d-08d5a4e8a12a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215556_048504_B1578C05 X-CRM114-Status: GOOD ( 10.59 ) 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.0.78 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 | 71 ++++++++++++++++++++++++++++++++++++------------- wpa_supplicant/events.c | 1 + 2 files changed, 54 insertions(+), 18 deletions(-) diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c index fe7ffe1..9e39830 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) { - if (!wpa_s->ap_iface) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + if (!wpa_s->ap_iface) { + 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,16 @@ int wpas_ap_pmksa_cache_add_external(struct wpa_supplicant *wpa_s, char *cmd) void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + 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 +1555,16 @@ void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + 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 +1573,16 @@ void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + 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 +1591,16 @@ void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + 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 +1609,16 @@ void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + 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 2fa3381..6524a53 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -4243,6 +4243,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 Wed Apr 18 04:55: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: 899893 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="CJHli+r2"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="eXikFa7W"; 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 40QqfG4ztBz9rxp for ; Wed, 18 Apr 2018 14:59:18 +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=3UIFPjdjs5EA5Dsb/mwuyWjX61d9/uBmPD7Cx4frD+4=; b=CJHli+r2089ZlT 9EHx7Qho7oB4TmX+CQMF7tvINCDKB81BHJjZ135bV2h/6Cu03HEV/E0p1bt2aNGEumB8/fdPOX+ju g1h/e0PgoXWKYAU4LcYhVvckC8J/vhG5OZnQh4YTLC3AnCZn2DAfRT0uuF3w47xTcRf/oVO5LzIrC AYbWBXS0mVdTOzrHkrF7P5AOMYphaKeU1HIVV5daNk2A+aZQDN7Cs+hXXbdFvhFRhjBPw6OuCJsRr 7SpESAYXVsS3YpulqQmd1z/tcO5AQmxc84I2nAEaL54uRNXEibdb4v4/tsV0wG2mkp179y+L8hebv ab8oeThKoX/WZTqT8h2Q==; 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 1f8fBW-0004dc-RT; Wed, 18 Apr 2018 04:59:10 +0000 Received: from mail-he1eur01on0067.outbound.protection.outlook.com ([104.47.0.67] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8O-00036K-I0 for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:55:58 +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=ePw9EX8lA+HhY3kwTy0smYaZwix73IA/UzcHH4lnvt4=; b=eXikFa7WXgprTTXMxITeCZo8TObJqj30DbiiUKGfV0/zhKe26ft8WR18ye9idPCDcol4FHbuWCQ2aX7IX7OrXBe/HkD6XAlo4ws5x/9BVCGArqcwf9G+0/qHKYd4SQm/VDFkv5MSLMJGlziC1+xpmAfUHJwj3kCeAiApA33fmLY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:39 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 11/15] mesh: Allow DFS channels to be selected if dfs is enabled Date: Tue, 17 Apr 2018 21:55: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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:jFpH4d3QC2GvvoZ3vul8AOYbEpmskmV1KsqQfT04aaqbcQ9HKM6ac0eDzyCv/llesrS2LQ53VrAnu9Hh5eSYV/2I4AvyM8SIyCTdo8IL2vedpeKHzap4VAt9Vp3Sui2n1dtFkAl6RaVw24Hc+mpruev/nekwxc3yL5Bw2xOTy51yepd8tGAUw7hqS/KV8M5p53bDu4cMnPpBHuZhN9QFG4xxZafTIBBop9G6QRX2thluvURnLrwBm66F8fGZL1Ld; 25:Xmips1SgHltcgqwqGrgsZpDiacq3Y0b/diAM8P0sibT03iF3zVKLIh/jU50bk9//HbF4idp5E1J5vpXBz4iKUcBaSXZEVuiccXzTBk8U9rKVuXF3K3slbLxjgI8gOJg1cMcvSny9tW70/2qaXZ2zjWdGdh0PsrXinMqyfF6BkO8siPqFcK3xYnCxdXjUt4TTs2hoA/jN0b40HNlyeR5LHfaODVEtkJ3Us8myyFjh2/TznivxVJfq+ivCoNZhqJ2MUGGmG9VOZLhKQGfyqQuxNXNvKqR5b00wauHnJU5Lc5HQ1J2fSFS+aqQBITmDMSVV6g1Qk5Z02R3ESTpVjO4d5A==; 31:+0w66tHcZqnM+xwRqPoRI4aU/JK8cqrRDSafTOdIFgdT7ERiNnUpOBnyWwQg4OdXquPH47zv040ldte/ma4nRjKR/NLFfp/lhZAuCAIb2SbKQRYtb3UvtlZH3Bp16C0ZNYTO9AStUCIWNhtSApLZP1ZxvSgXqAk4rTT+Y36VzxKFV44GMVl6GndNXjh9TDr74ONChzV5AF6P7eo1L16IaAppx19w40Pn/poPZwZkXVQ= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:U8XUpfXBoPNnH3J12EfBlkIJsCWcjR2ihoCHB8z+yjP86Laub19hAuxeEK7E1UMAQbN2xykg5uIGjRR2iutkw+b9Tw5PaYhfzvmzD0oZ2oMPJq1ohCC9dQGgNv8gW4cFoHRYJ2+B2UIswjYLxLHm0W2ek8NsP40C/+hYQzMGB046LdO38dzqf3W4VxZkJU1FpAa7DI/JcEamALgezJCbDTWhIjZQZ0zA6/CwOL4jvEZgQdV8FxZTf/QjYPWW2VcTs0B0dyl1A52LwiLaW/VlNQ1VC2u2APwuCWM5WoGHBWXZl3lxzaEjZnbPwppkFvlq6um0sef6oYmHde3uaE7rkQ==; 4:1CxF8OyTP7fd3hYa0tEc1iuVMasAPuh2avZo7047Wn426q/bPD0B0tP/9xQH2x2zMWLsmQtwYPqMfyWEMjjQNeYLRu3ePLmzNHpMK284aYXaR3VZg3/XLiNQbzGM0Rk1Biutxww03Tw0UJcdqvdvYQDZH8NgHfNybR4AbhuI3i72Fgvitc2UFslmYFzApDQDx5pEceeTVhjUlSgrmdL0l1Qw9OKTdAnC0UJNP92oDKyyGsITntRM/VNF+tEvmyTLqNS2r1EVjEE97EmJd4OOCQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(51416003)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(53936002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(16810700005)(81166006)(446003)(6512007)(9686003)(4326008)(47776003)(16526019)(54906003)(16586007)(33896004)(316002)(59450400001)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(386003)(8936002)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:nov; PTR:InfoNoRecords; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:eC+5QhCRTuaXXGWDU84PhxWZn01TC7whoImkIBTVT?= wmTRc25k4ozq42s7ggZiQVf+o8/0DCn2YRfPx6v45pobtxI/O/v3YhnLxPRDkZCTvFxg0SPX6l+O2dW/4JY+KFB0/YwJUxUmrllq4XLzpNGrmitY9l3Gy2r75O3LTIXpuPRcc8qHY8INJCq7rEOCTrQ52huXkx4iaYBBgd+wU96/IPAesUVdSRStjxOLZEies6FIAiiWIVnxonq3OFyNOx6XwUivtdjw6V5ZHXDTDxyMrltUS2OUwHZte6bEtgCGOmKAadyZPyVcfNJJB1MMiH5KReATsNqB0ylC0DB4n4a3tZFKQ65bZQbDpgrsoh5mtDI6UzWrX3tQElNGJ++8PvLyyZJTFs1u7p31kxyeI8i1/tEzpxMXZ8YiGj9NW3YLR/acocVP3t7hu8cZl7bDlYqhEwY5q/v5ftHiN78h5QLO4yf2mHPZopEa9COCCUKRmPA/jCengAGARWOyTc6ks5+xGoyE7siv3MIjVv/WrsaB/zYcwxplj1gTpMCL0qLo1i9Qr2r3w/df1q7+2yF36DHxnRdxcuu4F9it263ZtgpktVNv8W3IzBdIZTxwEjkqVzdCKaSJ1n6sYLiDmzHpPuOGtrdoUlkRAqS7IXmQwEaLQNj2OhJ1FwklO949PL2vT7l4YzpPON+SP4nBzBaK+ULex4E0sqweddPx4ioHVe/bluSkIdLyvunWweIPScf1me0iCYJQpqzqT2aCfM57Vq4nX0P/pFTA8h9u50odu59Du/7wm+3ZYvVziWxHVFiGnJmkQP11fSJq0lXkTiqctT2kwKl5nRVV1rtFN8O7iOUGC5S3FRrLk7qKLcy+A50Y10qbQawmTr8Kq7KmS/tmEVwF0A3UdYOmiqZ0L9qMtd/m+2JFY8ZwOJDSXFYlOVWrIITyWObtNKMAkFy5J8cKBW+1p6GTLRCdYvc4BMT/xWYBYe2fgM9Z7cN/PGl8j4liX1Z1s6EeDFjb9iJ6Pv3NFG4gzRAfXyrTy8F+QV0ViqXYRaPScNTyqxg+Pb+QH7SGAJ17CxSzkyZKTVxiw5ZuJq+TqZ9Bm5cEiM2oIwcfiniICD9aHvjmaX2nyz0a+8Yno8INtSuUxtREWO8mZiTnozZtt62zKu6A2CzwMqH7Qpc00XiP3F1C/LXsMRcFNdEmP3nWRInI4xsR9bkE85wJyvU56RymfBTvw/kBGSANdP9cQ== X-Microsoft-Antispam-Message-Info: qxqQPMNXqiF/d+R6AyPELgq/WlZDWy6riuEJVpztbyX3YC9PdvY7XuWagBVS7cuC9bvReO9jGNeQQFsCdkqpkmJdU2ys2H7YCQ6TsXkXlZal39BffdOMmgtOxmLZeXmm5+szqdrYYoggu5erPx5tpIWNOr3ucFVjHJ8XwJz98w3rAKB+vvRzmaRPmd/0y+lU X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:U6uy2KIrLEQ+XFsLnPQvR7DKsKGGsRHJQGoDvWnwB3esNZdMvGsH7XSXil63tB/C8yUYDUheYuTVq39x1pRCouiJGLaRIvcqoaQEZ8yX7zbP/gKNfhh6PFTnDLb498+uADcgkaJzUfD0CVVS2ZltSNYsEPpd6IzKqKlTj1e3MslaPPAPgsfvBjGd8L1E/HLk/Gkh66oZpnecM9OsZh68jsHUM4D5XsgZA1MNRJTxlJkCRKsbgbNiZqd5xD8CgWZIPu3gsw3m1liyW0n/MlwSHeHW8bxw8QOKHjfVKx5aTYySuI/iHjyQd5BmeT6/pfJRD04FKDgvniFMKk8MBlwBuIYeOedaJnbirxBWc49Jsbc3fbM+xV3tCUm2UZBZproCXqykNkD6o+OUeAbwBTEhwK8JkS9nrKIYfIg9xLQP8GNdu4QITcwRWPX+x8IqW6xpwxoLDy8+bQHbR2Ne6RyCUQ==; 5:IT5LU8YJ7XjCGbPfTGqwxLBYi3msJ57zxt9jxcYpEPDTma8xijzsLgLLDmn20g4D6ey2z6zTkaZmncXLrYb3hABvBkhWzQKbsnYArzwkCMqDgdIiNnUEb8dNh64/N7n6bjw/WVfKnk6x2SJxCc1vjq7f840TmDADKUzj4FEg+oQ=; 24:sUmZcfJnKtezHi4N0rYA3L735EfIuAnjDa5szjQmMX02H85Uu/VDvyDCPdxlIQ4i5GVhDXvAeyOMd659/4XeEAi5tM0qE+seHqmaK+Fhe8M= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:HVUeDZbicafzUXsil98xctGHLEBVFBgTCZ/+t3lCvZ+5PeejfvTuiiB96nFdNOUpmn/9IJBmFatT8hL4A1qeleyFylLejT2IyVgErqXQVBTOixvvuxK+X4w2wxYK660Qzs4lnUD7EIhBqX0WQsQeZF/gHI4qW2aXoQOUa7QnFWcz6w1EWtygwwgvvDnmXswFuJB161XtYszeGJL6WliEDby1pEiVd3YRN4M2JzzJQQORKNTR/GeR1qAI8Fp8DAsu X-MS-Office365-Filtering-Correlation-Id: dab5866f-0c6d-4c70-6088-08d5a4e8a1ee X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:39.0633 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dab5866f-0c6d-4c70-6088-08d5a4e8a1ee X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215556_631973_51F10C1C X-CRM114-Status: UNSURE ( 9.65 ) 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.0.67 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 7e7e84a..91af2a8 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2053,6 +2053,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; @@ -2129,8 +2131,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) @@ -2156,8 +2161,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; @@ -2247,8 +2255,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; @@ -2268,10 +2279,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 Wed Apr 18 04:55: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: 899895 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="YQwSOp/B"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="H2qhikRL"; 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 40Qqg160SSz9rxp for ; Wed, 18 Apr 2018 14:59:57 +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=HfEqVO6PQdHlJZY4gRqEDBghrHJNS4rEoYYL+kh/6QA=; b=YQwSOp/BRt7pol yen26U3yabALFenSI5uoBV8TMFUHVyXyFc7v9EuU2b9pbhXpWwdahZwKKsPAz/08J9KgtA3vKhuPt DkWG9MMsCrKLomvLc+04Jr4ZOAhjk6zGc6Zx9NnX73ANgINjp4njnIcwLczh7yP1i3A1TNGKUyOn1 iKDCtghbVuvTfBkuDOmOAE6hVXV6RFrbSDfihm+PP253/O0mELT256hxUyCMBG76HOP5kFjIJFrxc rEVLH2Tqlsz7lRs5stFv5sbPOKzijmShP0QRWEv1fZvtLH9QW/gAWfsP4rkba7n1RxkkVbygpb+UJ 0hYoGF8Xb02fOC4/OcGQ==; 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 1f8fCA-0004xB-Un; Wed, 18 Apr 2018 04:59:50 +0000 Received: from mail-he1eur01on0078.outbound.protection.outlook.com ([104.47.0.78] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8Q-00035w-HL for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:56:00 +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=5FmDwROQn68HJ5I0tYfjhWKRRxXdCEGsAE1wNgNjuy0=; b=H2qhikRLLu9QJqdmCDsbe93jwU+pELXbgibfNRf4cEYY+AtaWogK56mLWdlJ+N8jeZ0OdU1h3YaEcWjvpUjrEvszw3bsAxonNYh8sqmQB4a9Mz43v3p3hzf7RDk1/NZwb+sNlNiaLOoI72uSDOGolNzC/Proo6a7U8KIQie26M8= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:40 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 12/15] mesh: allow mesh to send channel switch request Date: Tue, 17 Apr 2018 21:55:09 -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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:6fLimj9y0LDuG+wrSskCEImY2xmPvkaYdSGNiH8xUmg9hFQ6/qa5UZzTzme88OV4IIQUi15rMDBR0V34FF6NEsrRyvnsdRodgs/KKBqNeNbBDVyJSlWaWXYe+uCeWP3rzt55MM3GfXOFHpQukPsxQTZt7wtqXtd7s/gS8tZ35wP922O/Q/6fDxUUig9b433qGxIaPmJsZTkoRVcL/r/gJplx6lqYMOeJHQ6u3a5qpJaH6cbws/LU/obBar1BmLjN; 25:tcv/e6m+qmtRHfd7wExqXjLcqi4uQDuDpgTQH9/yaZCq0LQAAshMAnzc1PEt+59XoRi7o0vekeEuBSwIiGV/0D3Yc9B06KDmclm9JxYPdiYDSUhaNAHm+5MUNLjBtm/5yCl7OmWPZaRYJaa5cDgjavDOOrXYTKOBzqQMiYMVJaSyT4asvb9QQUDBW7q6KsuP+M+3lvm2ud+v+UX61U7aCWghYUbqJKWnViLt73reCjEJ96CKrc7UwwJxIAR+8JRpXZrP1wAqwA9R5Pe7h07QhoAPnxHLSYj+ZwggW23flDixu1BYL/8TedrcnUIvLGB7Nx3OM/5O1fPfCO+XGLtCQA==; 31:oISEJfo5kkmmsXrdWUazN/pxG8gTOg3iHnelMK4F9nJFfH+oBm7VayGUPu6I1+cbFnrgS1lIFfQd857gsh72I8dzt9qeaCoIYrzzVdW6jgjNJCIr3Owt2jQkSs3GrEc80zqTQpwmeoG0S0FPLbsioVy1Ms77upojcxg4C73eJ2IoLwVknkkh/VESUNSuDwxsdO+Refp9GZSl1zNL/W4JafHTy+SrpS/UofeCRhbg26w= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:a52Khz8ALqq7BlyujUzDUpq66Bxx5O6P+eqaCa++oIzu/kTNRxU+CJEtUrLS3WslYVv+hU3Yoc1rTdoxZLvhbuc5lkoiUgWCuNGBI8FYHbmhOk4Duc2r27o00BmjeX7sp9wzAlA+cyBAm45+M4DoscFQ+jWaIahUhgqrNkmM1M6LjsglD1hVFb3wLbOtJE2biHUq7/3eGb+PfePlG9vT6xME6KMgNfae0vk22rIwhy7NGMaAs+bpaEK9ZL1qv0MRpHkYq+ZWjBlknBpPTbYF4BXFcbF0uz1FsLgHQXQl1zE7orxXPRpNpmuVkKVP3anSCdGqmcIHAS/75xdcV5334w==; 4:LqW2QLcXf7rlVs6IY2c9aJsysSvZrv+QhqAMxIZnq9RvbEKfkLoHkkfgxP353GNJqShw/K/ZgwQWUemC+TWrx//W6UW/21Xd/fYcA/JBm5/+yu/D8buGbhdfQU9h5c9CxE4DZCjS+5Mpz9UY9DOgyO3MaPfNjEg7yc3BoKf2j+GbP6AGTv7B+h/QtDMBDDvM23nC82CurGA2G7LpGC5qD6GbBo6f4CQ8CbpdbjGTIztoW6+t/JAUOhjUG3LyXrRCqfinTA+HujeX9RTH1oUxEg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(59450400001)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:AL4Tq/DZWDqCwJ2PyMFyVt6z7CAKEIqcnOQ8aFlg2?= GqY9ELLP40wez2AuN0C/YMhyAkP+4TW8T64GJO0doperAPGGRRB80RrfMz3C3Q+ak0oymmV7t4hibr7PQWVzwpUsQvcTpYbGz+k47fvR8J5wdrwwwRY4UbXpnKXEUn6dWkfKv4rofZiy2dmRxGxwwArTE4NoZ9u1fgpQi2mEWQKmh77nMm3PS95kd/+4b9KYfs6e92eMeEf/o+ULXiApLqSgUQRPXPCNHtnC7pBX+PTL9eXyJTHDHvth5V/Dsk84ULaO86aGhNN/JKVcKlac2T3RvAMdgKZtni3+BmpacxHcMjpMk+TBXRt0k0XfjBNdazBizjCBjFWQYr0QDmBbu6p1qQZgXFv6cGladMxJJ57FQko8mQd+Df4tpX8cRH/esCl7lCZcJxaLQQnUf8UH5l8XFzQLsXk0T9ociSUpDNlrAxXqE98OlyM9h0pkt4FFMQ+l+4/ujQVeX6Oervir2L+6jk8kQaSkT8y+IyMTlQ/s7rXmQf13VzWQ1007awqqEWywvfHAtdA++HBmpiCK8VYUjWFMzBBnjHdf7RSn0nQ72RZZ/35MEknF9zvHiPKm9xdx8z0vfPN9I9vzO4erIANBG/39SHu2dJgFMEKliK7HCrUMH9qpR/UBTJiqhi2ol2yp6M4+Ejg4G+q0HevincZNWMmwn1Ec3AMuuNOCQPqyQm45zglByEi7YaVqAXvaHBj+0g6V9lQoMVLqDZCU19vb+whBneoXe/dvjiPcm4yHWYsVIA8uoAMrjK0CeTkuamMWE9vUvjHTaCcEENeOEwHSZf8r7+f8qX/s7XU0oOXYDj0ccrcgg2NA4v/sKTyYO4Ri5aZesFuthKVyHDTHXaD2v0ZA+c/9meJRSqGIVnClIfagVG5GMmacK1gSkiwMSm+u0tH2W5qzYIojwNYwWjcCm0Iug5tIngCQnWtOKUzFsysYSD0NNitwfA4ZvMJHbmIf2kybjyvxqXr76ebXywM1/xr3U5/BolcLSLHrni94YLWPBNWgr8tLqwqbCSyh+xooTwKlaut7VS4eQvnHHWV X-Microsoft-Antispam-Message-Info: gFg2lChw3OEhe7A4eONPXGvvlLjaB1Uk5zHEK5/FNufdmg3KceMLP24vdMl86oRY379CBc6kGEVJnK02LkDp/8Q6Yd4v87PFeb/P4fpX4snB+Yz5lDOrJsJQhViNmyBjgjKTTvIBUQBIVViminMr2tJJVL/rn2UYz6g/D5tkhIqOLVULbXMugiZBHz8QQx/3 X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:RpsUQUUsakvkVp1xYKpdVn2MLo0y4BR5NzngJKX8niA/0W1bnl5szZuQQL4QWbcofzcd06+UKQUvTdYIBn1tylt3szy6ttQOQKzMOSmqBN1kZfi0RYfNmUpM7hqICpALQlBqLjonHBx3Fs6Jd+JZOYkrxyzAg7KqiLKDIEX1ZPHbTJehcB2tn8GtL6A+F0xdM8mYrqGDU+hF1rrbRVzzkjsLwwKW8jPFjMo7pcHnwgDmHXZNa6RmcZPCg/TGFW4+FGgIojYIZ4l9khBu3D0WXm9K2ee60SsWyeklbvhLjsyKmoclrgHwBr2aXyb4bgC+eO3mTQiKy+0T1QiRpvbY2V/q2DnhKIfVirYH/I/EZQWVwfXkUzAa3NBCWDFLsbTobHkX89EKacSZcJyM1dMCfEAXQsnV3saqBdZO544QnPAfEEsOy0IAB1hg0RNiHqTeKIn/z+axPR8kQkHSWxgYOQ==; 5:NMpohdcwcr6jZ+Y8gIeMK4nuZjjkwyALtQ1eQBW08AY8Ab4ji6H/khxBL9Ff2VvJV/9hg5kS4Xhczl+FAI+GAcwuJl1FXogRafFBOJlpzDeiUlfNzT72xunZSJcY4HBZV85PY+9rZ2yDyrhKNR98642QmMnub+Aerlt6DZG7DwQ=; 24:X20dFFBgp/iLuwIoPit+/e6pP/5QOBwL9ZaNCHp8+QnsC1HLpJ5Xej+Oc0T/lkh7mJl61JHkZaP+UT36a+ahkmFKiNCzPB1/nyDWKy2HaCQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:fGOArwCJ3cC1xdJasISNTvU5YCYW9iI0oFQB9JuE/Idjc7okFePZ2jnnaBDidv1uX8rRZLzKNbYE5LiDd8ief09zRrkH3fMYfuxJqFaqVURAUpjFdG67peNohKRoGYCcZmvVFBnGawwT8VMNbOxoS3AZd8UF7YI3Qo6QDHhORQw7YNs/AWohb3COBmgyCzNe9DotAmk9LRTAHuau/K3obmG68hdnAHtg6If3EhO9rA9uq+VznHLE8NmEBVYsHLpo X-MS-Office365-Filtering-Correlation-Id: 2370ab18-6b96-4fc0-6e7b-08d5a4e8a29c X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:40.3602 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2370ab18-6b96-4fc0-6e7b-08d5a4e8a29c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215558_735918_68BA0C30 X-CRM114-Status: UNSURE ( 9.84 ) 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.0.78 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 b677f38..c779407 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 Wed Apr 18 04:55: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: 899897 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="E1/FU/Bp"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="tdc3hWuZ"; 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 40Qqgt29KVz9rxp for ; Wed, 18 Apr 2018 15:00:42 +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=jQ3fxso6EYi5tgjr6DVpr73gnAaHsB7GSleBF2bQxcU=; b=E1/FU/Bpbo0uAt ZEK6FtMHA+OO407BL5BHlbatScH/WUWi78LwAK3uqN3q4epFJRZDSsLmCc/igxWl5Qk+QgOfU/luc QIxaWizibO5pMJ/dB+8JZ2g7ZQnOCPmD3VMKHBx9Ui+hQ4TPt8yHQ0n0In3YLm0zPgnxMn1JTOWgk 2TltJ6Fs0Ab+bwTBMH+cin9jwSNrwSeJpzu654134ivHggH6vW2E8pJ2WTGBg58kljuElayvstZwh pUTgwNHDGyY+C8EQS0dR+s+6GVgcXROjZI6Me2+qAIr2e/rpBSbOy0ipITZKXOITX+oqLz2juIdu/ Rq19r8iiff/XJOaBC2MA==; 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 1f8fCv-0006S4-4S; Wed, 18 Apr 2018 05:00:37 +0000 Received: from mail-he1eur01on0067.outbound.protection.outlook.com ([104.47.0.67] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8Q-00036K-RK for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:56:00 +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=C8vAeNiY93CORnb0Pj3LrNIHCgV49LK8RyreP2e/znM=; b=tdc3hWuZ4oCfUvlEP0lnDjg04pESkWMvJZFd6fEys4/50rZp0AD0CX8S0I+iTPVN/elV8d6tmOI+7Vfl3tR+NigxtyFg/dMSk+8NOlQHHNjsQ7u8dTFBYpPVAcS0xuJq1f5i2yM8btcl9mPAi17EhcEBD+5cLWoksVMdpJLqqkE= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:41 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 13/15] mesh: do not allow pri/sec channel switch Date: Tue, 17 Apr 2018 21:55:10 -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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:YJuBs6ejMJwSWAsSJ6QqgtYHiVzr4ZOV6HuyakW+Brtk5+p33La4AUjNvsDXUPmJREUMtHGhxB3Nti5KwDmzIrXwR9STMzixjJCrWSt6yzOZqOp/9zViug8tBIZT1C7B9m/9s5EuhWaAraDj4SDeWVifl/8ugfXcY29PXMuPpiifeq39NWovTqJufBpYayeJO0qycwfPte/BigYwTik69c/VgvUYpD4PEN3wYrnSDk6VVjdpxtVe15Taob8fireG; 25:N3c3KybRNXx1nZC9URNjQ1zqVFbv4GiBLCczcW34KVEOE8kXiiq7SXqU/m0SwPe9eTPMqtWMmVXTX15np2kyMCMaTmJbUWfbD+i4dTp816YjUZEP0sXazxZZ4yRn6Q5wXfNZ3yHrOziwQ6wojITPp360Mc/GGnqe11/K/NhHdn0X8W8dESP6SZ8s5YLSVjhp1lCC1LI7q0bAX1KyfKZGtdDFadnwvhJmrvkEuJ4aqiWV60hbk78Vcg2mTMTEGubsO+XEZIw54UkLdR1wOlyTBNIhY7MTx3A33+zxyEaWUBBlK9oAooNLMSMar4o+MCsfyTWRHIrQAxpZMX8J2xjFpQ==; 31:jNM/tTneu6nVi0t/eBgHX0lEwqYmc/l/KVwEF3M9b/bfbKzDw61+WK2EE4nYgiSmNtgTQjXD7eFE2zYMSdmCd986bEXXvlHjf9E24GeYHXdEv2a2xDXV2x3cir9dIRKbXufIffltMu8Ok3LO+QIUtl5R1exwsiyc/JKiEJjpuMNx+lsKMMKSNPb1Piui4/VqhF1KdxI+QMlvxSeFtoxG27+WZVOCCSvoX2LeGLcOYBs= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:lX9nZPtZHoNSa05ZAUSJJXmU3mNTXbbojAFv0uPQjj2AFHPHmbgazCczb/+J08kxPpPtJB7Cg9PqGTk1VPk6b6vKEbkwrrL93ANuSzGhT6spABrcpImpepDQGwKsLxcGUyEmIOu5qFY5wVE+X2DnqoW9IjoNn7gU2RehmdRXQuMHgocD9qnLV1DHKRrkPKzg42oC0NXtkLP7+pTyUq7KwQXBDrAfKpZ5zDP4I8mOs5Nr0elyfK6hmlV3GeKVx9wQiKfg0WRbdpmZ+a+QSmlFjAYhBjizn9pek1ZKXKe4S+nvnfekXXFYGLrvyr3Vd5ENTxEWeMcYSNAsRhdtMldR+A==; 4:6bsvto2EONwedjmtOYSWuNvY+ccG7X36Umu9elh1ip77+YgwefeUm4U0o7dZEtVWI6XXLKPpcFRf9SjsNdZuGGJl6q6Yo4pEZ3AAqJNuCePeV0kWZonqdDYwA3PJJQydqSKxTPCIM+/k/JnJGy00W4kLW9p8M6L437JDvjGlMZe+SBmxmWYJiSM5l3ppGsaZirZR0LXZPuVel/MRMGEM12rNAqRlXZnth4vsOebt3jrAVRiJflygqvq/ly9OM7jYFreOgEE3nRaL4vDaidqcYA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(59450400001)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:3PDVa6+2s0kLpdbygaJuhzcAWao/I0OczJeHE56gX?= isgEe3ycuOud8kq6qdXrY8Eus47BMP7/QziTIVBSLyOnVpFZWZFpR2jXCXhAOOhx3iqMumFFG5BudX/kEHvJxzHFmPYjcl0DY8FNZ4ZPec/v8ctTCiwU5pCzb2+0g1HLD04w6PSUXJuCcN0SLID62+Pbme7/7G2stnqhnSMqjM9UVLG4V4nQb/9qZoubknhT2dZi/gSTfqbnQD54LQsvTbPNZzhhygc5xG96d28ifNmGyb2Kee5vnGqMvzbhsmsmR7tIV0X69t/y1YWF8vQdWO3SiB17PuoxEQRNLhRn/V/rOpPNhi7YZ+FWj9j5bsb/QoHSs6NcFQWbMC2uXYOx8s3tiOti457VeuJTS7eQs32lqOrCYpNv9TzIEv50k4eFyn0sx4Lb0APS9l0pSLKrAdh+9p2TKfM2gCj9s6xxBA7ni/btq/nt0WUPNSABfIZkM6+btzGSvYPdSZ5stWz1i+B12/0S0pGh2M9oikgR9PWy7xnAviCi+r61/L+YnU6bsdi44GkLzf56P9A7vm4Ll4vVYQJu8ca00zUUE24XWvQuK84iFQBE6kWHsbE7GVe9xJ63p6n27NwHav+wtIeK6d8twLPI7mIniDO6C8j9A6sZjU/jQkdqtyW4v6tEpaRAmiXiB68G3fK2b003BQU+8Robmupz/Fwvm3O6inq70toYQRL40Rk3oZRYe/cJEbk52GEk8JtWxNs9PkJE7GKp2xEdINGwvjNnBexMi4Qs1xzR882waFbz98FduLsOwwcE2gyPbX0wAxa5sawQD+0etD9KoXqGdkzKhPlBHxFWFT7T0ZBT834jVOMdF42Tp0Nv/U6lDh1UjKGp2O3TPoZnIanumke8f7CqkpixzaabtTwNmzqAyFC5bCFiHGB260tgYGzeKq4ynPaV9/wImD/tUzwdZEJR8byHDCm0Lm0wnTu5M2lWR1RCiyRyggQ4GtPaMXnuq9nzUBjIBvgU1D21tHfgd7bX6TgVRa5LHO+Wj3E5nNrDHEPL7Qp905fok46EBEdP/pvAmJ54AfZ1skgNBbJ X-Microsoft-Antispam-Message-Info: aOGuxlscP40fHwmI6Me4Nm1ry8Y2H2mh/O6vXFyB+9et96+jy467H+0kMg4C2rOf9FqWqIaR1zaftKcH9pbXvcD6+l9mJQI+hapQyhbQZSEdCKdTeGhOyG264fkVWYM6A1yWQK+0JYZ3aVW9f6Gqwe+gR6ovM2YkCTx7b6hTdg6qGrC95nBit+uuhv0WbMjh X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:dn/8Q3YV7YXBuUgvdvjAAOdArgt2XA2mi0QMM+tWpHDuyAjegSsPDgjl/DJVtgLi6ChShOutb+qwaiXBLpxOB+kQ6oqV1R6m/WaEW5xTSxPMyhTqjInKGq9CkcqRE/P901iIuvf8mHCui+17+t2tG5E1XeLhJcBkaUedt7TI0MdJ6+mqe+5N6GGKcQ2O+lZkzuAlXDooYUnKz+v+zOP/MLhBvx2nDYQT80YlJuvQoA4oZLSaTbJpqXPTt7ngr1Ts3GmO/2gGng/svAq4+tp1h+U1XZCXRZzD9gRqu4boXCR0ruMBhS9FaPDPThCoLSkvuM8b65RdesVaQCKZBqTrI9uInxcUVGjKo1omNTiIiC547HdELVqt6n9yv+19ZuVl092FKPslNPRWvkqywsl0xx1CF5jW/e/5utiK+dhdTSjMdqzfvIx9IXGS2kjUdX3Qcfe9uanxFNx6FGq3SpF3dw==; 5:JSp/BWIcZX8w/O2rmZ+MztlP2qI3EVQBCsKWOi/Rp3XZFl+GDIKe917yATAIT9+c08+6UTlfx/1Jyn+6HmutmzGLinU67EVHiZxqCCT+ACy02R4+gDoXE9FB7xjiaZTbVWHG3ZOt7mjE6ZX3EfmwnIVRcTK31bXeZfStqNPa0gE=; 24:rq/BsFHVKjVJB1Moiqf6Um9vOT66ky5JtyAQYrDQBXqgxQPYbCCPNZhXecP1tDcOn7aWT8EF35j6xw07L7fTfLNgR3sJGwyM+OrB5fM6kac= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:jN0Wx5iz3aSqTwCRHcEpLDrnI0H+zgQ2OgKBNIwXtzgDQunBrP4Od5bwqLsRwSHSwSNVFdfj9EydQaGrStuxETa9O61vuVNxncx4hE6Uy5X3d3JjG54tYP5DKZQz8fnLQnPLbPria7MXezlDwYM0O7T2EGe8TpEc7bE3Uht3pBbdTj9FnANLQy6mQv/0C9puDtsUg2MwRila45nTK0mmiXxvYfeyr/SM2HPgw3IEft9SP/LJMXrZ7QvVzX46JfVC X-MS-Office365-Filtering-Correlation-Id: 8de052ca-f8d0-470d-411f-08d5a4e8a34f X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:41.5322 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8de052ca-f8d0-470d-411f-08d5a4e8a34f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215558_993398_2FE43BC4 X-CRM114-Status: GOOD ( 10.28 ) 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.0.67 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 f552c8d..67519fe 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -335,7 +335,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 Wed Apr 18 04:55: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: 899898 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="IYchzwIJ"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="ljSsAcLo"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40QqhY2RxCz9rxp for ; Wed, 18 Apr 2018 15:01:17 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UfUHjTb6L3NdBMsKh/vH7UpfSGFWiBfctWNjY7a4kss=; b=IYchzwIJtmujrB domHsHVYz6Bdg6LWUBKg159itXuofWlS5aCVCLLMPRPagUowaV1gk6+5Ff3LcKfHaOWZyaaPhiIkO N53ixmArnBDdj2RIGg8jfz/kPAMTkgx1KCXlRARwfMMt5X7ka6zd/HPyhedi970ubFctlWNRlesEv n1wPO5HVf/H5AbyrCog4X7gekrNj/Z0+cOslasc6tF/SGe4/Y6te7pFptEzv8dlZUHOT2CR9VJp3j wnzwZ0b9RDw2pZbsbsDSLfwpGSB56DOOG3e/AKLMSzSgZQeBuxchnBMAu1NxrLvYIhTxOjSC3YGER 9M2VksM8oLn12U43ea1w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8fDT-0006h5-3V; Wed, 18 Apr 2018 05:01:11 +0000 Received: from mail-am5eur03on061a.outbound.protection.outlook.com ([2a01:111:f400:fe08::61a] helo=EUR03-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8S-00037A-Cq for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:56:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bowerswilkins.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=e1KIvBvqlpcmufN9ZO1E+zCaoxCHAnUpc5kkuqAWBYY=; b=ljSsAcLofVw7LkqxgwwGNH+M9F2joF702dIUEpIugKXHj0ArSbrSuojI3J8I8CPbAgvK56XyDky8WGklMgIdENop9Rk1ESlsMIovF4+3+uqPniYVFBLz4uajM+82qpctU3tL+Nbd6/I0ys/XHINJChhyZ52w29vDDSI3eNIAWzw= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:43 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 14/15] mesh: do not allow scan result to swap pri/sec Date: Tue, 17 Apr 2018 21:55:11 -0700 Message-Id: <89143d059740da63c7a9491deca5a48028580087.1524027184.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:kawz6voLO3Mi7ixYypeHqbrmufI+XhltqJAfsuoQjIAFzjXHTSK8rFt7IK7CxpolsTlSegfrq7Bo4tDbMHhgOTn1ebB7iZlmMiL0OAloQ1mq9LR2XrunllmZQHbZVd5i+ECZc9OCandT9tR5u7rjx0wIBCy69a5e4CT6deQJvOQgrvxQDIADpqV3A0CBB2mHDJ9bagxSUpCuA+EFlqQR4vYApzV1zYGkAabUfpJLSc0oNPy+qyVXR9BxJ71HSXGW; 25:Q1mGI2PU/pTA4KXHkuMposEk06F9R1gfmoGaXOZIXTm413ZfLQsk6RpCyC4VbZbr/aQQxf8ZBwXT7n7DN6B8zflWAjFTivO49IfXtQ5QbSDYxMlCD2xZzSaBdY1Qhi9gLGnorx2wAxfICT6W4xhrwv5Uuf58hdgBLQPgj+5JhW9PD+TxNOdG7gEnZ6H0l/8MyC4x8aK52TQf7d75huCrNpGQJidjEGTJITAls5aYQ9rd9f4OD/I9NxG7MO2NXq5kZoxOZ9CzXIXIizFhVyiic5sLptafhBNxULInCGTowVqWo9loeYUKWmYXJtBG/rdP9+oJziEOMT7FEY54rj614A==; 31:qTmC7EHkxmtG7R5dj2uaT1yH89/H9sYiZKPkcaw2unKHqK+XLFl9JRJ94Hia6Q1SYt2d1A6GW5TTSSxmO4jJMxw7BCnoFFbyGfSkKteCajRkcpAqjvRYUXm137LnIUAoISyVIJBwHpqyJQBuZxuyQWC+tPZVwnPv/6kwjfwOwFxQZ9VBtwQ7UniL8vzckC4Znsvi47akL6Np3873WgjKnY71Uy8nhONCgtD0v15uEhs= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:7yd4+gy3a+amPJLydUdEI0DkiNZnP8LEZmwrtaAyPC7AZ7Mfc2Re+VchQ3ATOZYithCxPPptVEwLzxyViNjx5jSbCPy1RmrSaPpip+r0U2G+L3JY7FjyDvg30dmQIsyt1wJDBWy+/OnS1e2RlWXavs6Ckn15Yc0mpcO0hJ5EKoEmViQ3NMIPJeQoUr9MO/8Bf/69X14pzwBpHCxbNZ2hLdAYd3Q6WvkDM3FXuysRJvSVWuzxBzRw3f6bXUrJ8xZv+pFsLZ2A6e3ErF4+cjs3KBTUr1YgDZOPYMrhQCJ0UHIOy9YjvYc74OPC9JAMddFYV7PoFgBe1+SWuV9Ky+HOEA==; 4:Apo/viWtNrgcB7SSKL278N4loNhBZmKUkPC9WtCTXBslX/9yEJELBGgO9LkOe3lLxhKpXf4TX9jFnVvkXyRh5mw2vfl16TsYjC1RlI9ckbToTNaJgGMY+wWXpyRtYx7ekzE0mPSG3oEbk2LDe7275d/W71lJlYKy62OvZ3wA+lu3sk9olwTD/2P0Uuo0JhHS3Ro7DAZH3KCjHPsOI+vhe1C0zhewl/GNbYe/8s4GWjEQcurarIP3rDTF6/7v7ZSKCVil0UwYLJRmrGZeslmdZQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(59450400001)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:s8mYk9P30DnCf7OiUhXZrPLOJI7ty5Fy5xxRwjuRe?= XFVr1nR07UgY/h/KZnSOaDWHQIl38YpM2eMnxHVNIeZH9yL1smcc9IDGaLBpQoyWfmAWgUAGFnRgsQXMeFrCOkS8gxBRlrAwbMX+4jhkTeWo3RVFthKcgN1EZnRdAu/oNQkbg2ugVIXph43JQN+dlVUw/g+Qnw7XPUXR/Ngc+BkDkHCSdaNtS64cHIy/KnO9Ywgjz65qhBfuP5Q1tJGk9tfabG3UfpCJrD5RQCz0hWjfycGlyWw1C/vCsd9BJyskwjURQfSL3wlsJ65arbUXN8a89ZzPEgVC8Hg9Mvdfkm94Dy5mBqLlbo+2KCM3YS1iQgnBc5o5LqjkAaq7L7u8lu7awDzD2CyP41oNZOZ8d6RbLb6x4wT2Rv/qVizVcTVM9h0aFTZobxSdefehwDGoz8QDmuqf2/0ie5oFjUc1NpQMJrXLYa9Z+fhO9u08AhPg3/w7zEeDN0qoraVt/GYQOTBFLr1jn/lrN/ExHynpXAFp2YYXx5tI0jO4Sxw6p5oBD76CIx36WKqSGMo6PMPvPn7ZFJNieh7FWrvF25Xnw+JEXaldBTEQRC6XJGRPPR04I3x3EIzEzDiW7jfKdPf9oZAoLOkcLLEeuoiNacL68P6QyTVDxL7/wEfImRnYoTzWv0UmE7Sg9CFLwd6K001GcrJZJcHWrsQAVIwyvmZLHWzXVdGqG+MDKH4mHtqj5Hu4doQiMaU6LowsZk1EatJzcmkGszFNARVhF5LChrx8KEqyYxHDVkPms2Vf23rAbK8ufjMuwe/tFTwEDicZQLGsqT0VP5nC/1Wp+J4YZ85OTAbR60CRDZW+GndRWnDO9hCV1oihrUYfaeOu6oZ9f4Pqrld9dqJFyb2AmrBp/LqrCG7wgsOWUx1jW4EEnuxaPCmqrJUnvQA33+DjNOX8vIMkwO71+8MHZkdSKERP/0rrsU4DgisgTnOwZwmJdfRPT90HpQodysdZu5Vo8sz92smUGZ37Hg2zPqvQV/RutTgHgqJgkLI0HLqZmjYzd16Q6KizQ9I7MrwHm7wRuzyygiskfkd X-Microsoft-Antispam-Message-Info: KNgSX8ozro2w3ho8GcadqGG0ssjAP6IWMTmqMPWktUPd8GIFLvBS0lomPzpmGXzH9uhPzc/jm7MvgKlyZa/bh7Ao+ppRimUePy039pErcdmfvBjKjeBlChLCsMdwq5QV7nyxK9nwp9KJvsUqLxY26ylWz3uu4mu+M0lDRu9kkJXYrYvRf3ysThmpfyVwwwjN X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:v4VMfbBlHtgNbsbq00Jwd56SB0XOQB5gvamZZMc/dUsvgRiknBz64sh49hCylEQmNdIflmxu2OEAVIf7G+WJRI2Jo3rWR7AJVEjbdT90boLYRbzdbJaYVGLe8FW6BcqgvqIHNh9YxBaHZZJ9NuBUkZXHpOcolOH+Kfl5bTXW7RJGH6lQD8VqQryj9eYzplaYqWEE6D9tNfxZ7B16uH6Br1nsv8+ijjSB2HYod5cb4A3bElgz5Oy41h9tw3W8glFxtg8knI3MKC6Hkm2IeFMfNL/fwRImEmRJ/6JImoB8IHWw7u8q630iBi1vRqfNCq8ltuKwP7uHIETCPd7EZs+jIv2SWe4UvS2kNp1iaUI/nxwp124+J8p6kacV+aEFIpoR4Auuvedond82RPCgAxUnY7Z9Ys8CG1l2+x4Q5R2pPWqEB56cu5nhIDTs9vD7xSz6FoWFHOs8ypRXW/lpdZNi9g==; 5:PkTtw0Nkz5rztC6gZ20V+rKHMQ4YlldPtj9spjzeim9pBTBbwn2hmamyxYUUKTQP18IyIL9oJFzL5qUzObzew5VSlfEYO2Fh4OEHFA/ydgbxcuejqRQlRTAT9lh6o6ZfTIYrivxwxGDqmNMNpMvaoE1Ch3eMK0ZeMxTZWD4qsvY=; 24:+ycASCkGZs3V94Rl1agmZiYhJ9nmuZg8bjhKrdhX1Yjc5iC0x7V+Ga1zQO5vK/2tKILFvnt8hpESfC2Avp5aIBeytcEvrL36rnEggsRgjH0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:mAn6P3g8FZ9O6YXj3Y8bMUqtdpE6mQbLcIol25mgxigQqGDgItkxDHmFbPLJj84pyDFTCHUzz5Y8+Ir8p3P++51N2DFz4l5FFTVWFtiHbEuYGfAHglbv+J8C472Hc6OWaUOVfn0dgM6IJIEFmpj0SxncOeBMZ3ybWaZjkZCRUxHrm7FPvEfVUo0ApkKzOHMIAETIbTnwOWnuthkFsrI+GYdSVGMsL1YtRckPA/K9n++7KMwe1ArWm84Jl04AF/vQ X-MS-Office365-Filtering-Correlation-Id: 9c878ce4-d772-4735-4cf7-08d5a4e8a43b X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:43.0791 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9c878ce4-d772-4735-4cf7-08d5a4e8a43b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215600_484720_C879B783 X-CRM114-Status: GOOD ( 10.42 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a01:111:f400:fe08:0:0:0:61a listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 91af2a8..2fbb428 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2178,7 +2178,7 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, } freq->sec_channel_offset = ht40; - if (obss_scan) { + if (ssid->mode != WPAS_MODE_MESH && obss_scan) { struct wpa_scan_results *scan_res; scan_res = wpa_supplicant_get_scan_results(wpa_s, NULL, 0); From patchwork Wed Apr 18 04:55: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: 899899 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="FbBfdzGr"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="bmKW2HQh"; 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 40Qqhz5qP6z9rxp for ; Wed, 18 Apr 2018 15:01:39 +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=SGSNOq4mTIpaeorQvXAIYOdU4ccjSu818LlYiZ6rQyQ=; b=FbBfdzGrz2866q VWAwYPyRoP/3e7n8eGsihGf/3tJyaq/RciZW1D4eFW8Xh4kqdW+wVyPkwenHnb8dRynKV3o4o6vxI IioqhvlWL7MEP6pl7BUfhHGGxcU5LNrAoXGG1slM7PqVDd33LedBq8weX9je3sOiH91uueaDldURQ Fusu3gOzKDLVIxwFJLkjNuR/WHEJWjvgDGDPVJEo/Tg7yGdfCgkpB2z9ErgI3pVISwGWU1V6lCx1v 5Bc6ghqpWDkX7alz609OgR3wpn3K7WKJQ5wJSroqLGpDVh8UZtke4dmxWQ1i9nqFru4jC7GeDe6bN wr+H5JN82opnILm14Dpw==; 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 1f8fDp-0006rD-5v; Wed, 18 Apr 2018 05:01:33 +0000 Received: from mail-he1eur01on0078.outbound.protection.outlook.com ([104.47.0.78] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8S-00035w-NQ for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:56:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bowerswilkins.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=2CxFfV5k4GthTiUWBSYtPoTKM+lngdzzanTCi561X6g=; b=bmKW2HQhsJPkaZQDGK/R+Hzv4QN8+mO7sYbgQ69H56rTUBEgyleTBQj5BFKm1RCR9kgMRLG+jvqX7bKsHQx8KL2zYUmuMI+ZMpR+D3+hqtTtKWtTMRNoeqNhe25Jdy09s2R09JChaXVZY7vQ5s3iu3EGA9IjwLHo76VQTKP/NLo= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:44 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 15/15] mesh: do not use offchan mgmt tx on DFS Date: Tue, 17 Apr 2018 21:55:12 -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:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:Dk5JYa2U5pjD2Qrn2Ad3Klt1duMznhtEt2Vxuihb5totpQxIvJQQOwNr+rDuR1ei9Ce4nG3c07sWup6AMqvWWWWTSYJ57Ix1j4lInOcm1YbHgqkZaoxLm4Iw+pQIunriIus0APCewRqelwRBSmRV+34CW/74zQLKujnPGy0qv4cktNF/nY8dGF/EgAlkmOJsTjt1tqsfQKoT+5otZpusIUestaonsly2kpeAUTMkX73Ds2gBrOz2ypxFaMcreJl/; 25:S5mZaSHntqdspU3kWLP/hjfztnai3y/vm25nbGYQoAWKXtFjNZzi8pLfXVuFvqD30F9q/fH6yXc94229IvG9HUlG10xzzpqpKDMWspL6hzHoBo5DLnhsUTBjjI0WQvaQ6fnquhEH8cMMwS8XfPh3OgxniHGi9A0aVMVAlyjQ2wlN6uTsR9UcYrvXwHXjDj5RbjUP0+P4AOtrICc8CIa0a7IpR7iderJuDsZq+qstVNbrma9bGAAWEFId1HDRggN+uySAuXtVni2VIvb5S0NjY2hk5Mf084NZ5M/h6+8HPZRZh/oH17IA1YOz1GMDnzc435RMtsBbdCdEQVIV9szD6Q==; 31:TC8pIVXjUJ8Aqn8kV8wJw+yaza6/hJHxRLwm7FyrTQ+ceU5kWOSGCX/M7OYJew6mD3kSGIgx5DZT9M7Ia7go08+yO2oxf+ypr96YhrjU6LamAdwAe9U0Bo3YBXOCJxPcHAZiUassq1gGQL8s4vh5cS5FIODwQUr6ZRiZpQQMNqg3VP3uFEruTRUfHpQgSUYnpVdIHJ13LPX27MDtydktdSnflcS6+mtPvEQ5oLNkAyE= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:1HPec8AfZRnRnEGhrY/0nhc9WNvGQw5bk1H+RI4qyaR+jlKzPfdBprOHs4aMzHsSej/Q4U0NRYtFQb9/bTgBJr/LPBBytr0mB2J2Ycl9kQfsR23vKzxhBudYcM5XACdDrSghT9fUWlvHa35dBeBxryrvHelCbwbaQVNWRjinK/ner9lZdJhgXVFXSkthBZTgNHMTBxuPccMGm2JyyvsfFKG9/w083NzS2LMNlOMeZLxM3R6VF+KxzmkjIw4iD23IHWukEF1PAB+zM/9DZRAEG6fMXC1SoLj3vJC9WPvQbkw6vB3bfKE0KHGMracwOOBiWeiVzJEwGfcvFMAi4/RNOg==; 4:dUl2BOIjh61XICxvMZb7SsOW+yBpMWWnCdMHryCjCpBdVjnj6LnrgL7dHrFtTXYouXjU5FBG8IokMzvqEMuTgHGMCPuxjVg97iOWTNeljTQrqnoym6OVyDKFn7YQC2yFiZ6YsY3hXWRxfcKLlPySLsaX5JXAWlJQ+1ga3ajZFEaHNHdMGdn+v4CmbGClgJh7lKBWlVGY5mJZaB13hjsUEk94Dcv1NMzINjJCD5eAgv9lg14sw7M2RfPkB0FUzl6swbBKubGI1EJ3e3nJH4Lh/Q== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(59450400001)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:PZRlDx3aIs5khs8XKlVFDNp4UUrtHFKrIWsJRJgBX?= G23amqktlBcB9NoyRTO6Zio2TtNd/YxfHwTJ244d8kWr/KL7uwo45R2NtHV9wzNlJ5QZDD1Kp/3Utpyg8idrMiN+rpPzwZ5SnIgghrOMxonqqpNnhEwWk3ZcwX1hyoG3Z6CH2UJcplsnd9CfkGbwfy8FT2yJ/Bg4j4s4NcexZ+UPYRa9QvICHQpb4So7Xl3gyvNi/zKs73y8lbZOVUc4OI2ncWIeiJ7WjtWO/hRDzrd1DQmdnDxq9LXkjbU6ZX1Rgsql8n5bVHt/ONL1YnMMN1dPhg01G7FonN5ikxGX65FPRW+uQ49urMyZpLvojmN0p8NhiF2+t/UWFUpGIAlsyh/tgAQyEw0NIdEHTIuOsRMZHwaxRUSHNFcG34tQYJ0rKgTEjjzPx60UfzUCrQg1rxBCUtKGLni0YoipBklcx0Maky60ecLHmnH8eBtbLYz5lLhKsOfx+riX9wE7TYpIfuBOO+6ypNWjOBIwgtSulBD4sL1VDA/Q0XwY5UBFKfG43h3uAiUDqfueFbabzAYdiFTaMQCdJhQ6XtQDhhCtzyYfsxTLkfnI1iCmES7WvF8hXLJ0CiMlV/ADvyw3jZPK/yAteSUot6AyP/RM9GXbdBs685BVaFulA1T7uWq2sYZ/SptIjQQC3s4yzpzF9nXBNPqMgyp8jJZYuPtXDvnwmCAkCHCNqntk7z4X+cKLVZFGvVi5QUaH9v73i+JDQfstQlQUgdGQcN77iF2ccBdAh4HRqL0/kxse+0PcN+aodfCEUX4BXaoVxcSW403md++hWGr645QvpH/Nt/rgytyGOqInaPqJoxDq1QUqQBZwsrNuFcTqVodX9D+iYHc8/3pRhBx6B0nyFktdxgnZEg7acB1E1Jnuvdm+6xw4V2qr6VCvt/6SNQre90FvH887t3c6etFUuQFbTYZdW18BxQwYJ5RQrQQ8s9L0GSUI4b8fypfwgZENKsdHh2LoquPG9jQB3G3fYd77xq0WSjnPEa4AdmQl7OFiaZAt4qQrrGs/ndIlzUbf3fdl+LMaFqYLEdaM6NG X-Microsoft-Antispam-Message-Info: j3QWui8ZY+3oP2IOzRxSnVjIL6b182+95WD1lZjutZ89SHX6D9zgzHyKmtzd+puBnzn7Ki1rRDkpsJL8tYr8NmrlK4f/OEFfaKPWO7kJGrcEzLGObowEV580gDl//kIrQuGg/LAt0edqGkV1Ef7ZjTf/j2ctUydbbxtwqYXQ1Meyjsa4RT0cMFJxkNK5xJAp X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:GYz1rK/qIiyyF3fb7Jla/xzac63bt5Ae3kKRolD0i4djAw5D6BF+p2LW6smTQ1RZNkH1qJPHsTwceNLWZl2vCnCcSKOM/AUemdo9DUAykgl8LA6JGgn9Ir6DPGZU8O8pva6eLO0JUYpLTRG5v0qUpe5yBQXvn48teipBCeoVBXyB4xfgAkjsbVDVsLuxdikXjNtoHiyKKQkWcHVwvqEv4haQGMUFDovpmhv8fpfL3eZY31hPaRUe4K6yjghJvpFSgZQnFNxo8QWVL1mbTXRDBVgyobily+eDqtGoxjso/V5iz0TzD6/C9ZaTEKNL2BOYXVfriNg2EXSFgw2mlrRx1boh1QXFv8uaaNRlifZl7HfGEYF2jzRxNXjc3FjZizqxxYPtH5ekgPy6fFwW9tBkYXSSYkTv5Mbx4yVQJXFDnuEPcKrBYGECyw6LL9QphEYsMVFIjOK2BVoOzAxaXkZfUQ==; 5:O8bQqD2yG6ssZXPBnQdpbVK9zl1RBsUKp92+UcruaPfenEnEBfoETB1ud88w5VzyBWeiC2Ay/8l4WYTQ6aepA5Em4uicJbx2bh6vp2GtdOD1hQ6LQGbWUZJkqrWqWTzE0RzYs0mU+nQGGU40ioqTIoHGzjhLgGQeMW/r4XGYKO4=; 24:4rJ7ohanMaQH58ZrHbyIgEijBrbFimbl5FPCYFYbSxK69DfpnEuARIXcsMB1c+nflpzZoQHXkXz7CVqpWhqJYAqjbSDTQ9C6sYtJlKFL67s= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:Q8Q736dHGIzpmJmP7dXRmxunhWxgDulnItZnAWKMbI8h3KyB2QXS7FU1TlBwM2VB1iOptv1jNvJxDEW1jeRMGhQS+7kgyUOHecUTNPXxTV2oU91LL+uQ8F45K+bjswM/4dttbyC95opW0V2NzOG5QDmlYsSisyBXi9S7TzYqEZ4hcfZZu5Cy1zUJYF35IRnsufgERAwA0IQEt5ze5nfVKs10Kx/FignNQPumo1QJ4E41FG31uTO09l9K4kM6QSf/ X-MS-Office365-Filtering-Correlation-Id: 4d55c9c9-6a64-4bdc-1f9e-08d5a4e8a4ee X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:44.2511 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4d55c9c9-6a64-4bdc-1f9e-08d5a4e8a4ee X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215600_808520_4199DD67 X-CRM114-Status: UNSURE ( 9.85 ) 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.0.78 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: 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 c779407..6175149 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;