From patchwork Tue Jul 3 23:40:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 939029 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="OGJ7nDS1"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="BtfJ6XiO"; 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 41L1115FhCz9s3q for ; Wed, 4 Jul 2018 09:44:05 +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=aZ5TJQ2d7PmudR1AFHmYWZWgV7X72rWo3Pg1E9qL1C0=; b=OGJ7nDS10HOctC QIFp3gtM/AdLgizRngtXd6UohWlPN3MRnwO6fUlEgw9F2x1AAKBvs51+H0MO/f11NZ4faQGy95nkv 6BfggSXkxEroenpZ1ca/9opCNqDsMva2pqNYWxbhVN76HEe3AKKuNJoakmpcPgPVh3VU0Xd5EmehO SialGkPDVeqKlcJtT1xlwUu1rBaRr2RT+mSTofN0YTeJyAIYui1olMwgxiAXsJZ6S3JOxVQ5rF2C2 iulSHMdJc/Tmxc1k51xIH5pez3Zz+CwEgRZYHux9QK/53s+74OH4tb6ZjRV7dI8W3Ie7c9uEEzxnX 9Z9CQlzFTs6CoeP6qrrQ==; 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 1faUxi-0001gG-FM; Tue, 03 Jul 2018 23:43:58 +0000 Received: from mail-eopbgr60050.outbound.protection.outlook.com ([40.107.6.50] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1faUvd-0007oU-FN for hostap@lists.infradead.org; Tue, 03 Jul 2018 23:41: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:X-MS-Exchange-SenderADCheck; bh=9RwSDdp3qM5M1TZdxG5IfBvNTRexyydN92SHpZp7/ys=; b=BtfJ6XiO6bJUmt2/JVoMn7cvFlXiFqf6aMvJOkHmFT1g9LJ5jMH3U3j6/I/gOYdDF9tsJAw9HIobQ/skxRCIQRZ5laMTey/XeCzlNu3E6n/AIetPaOjcssyfJO9dYnRm1s9WglBEr/IyhI2v6R7rBKpFfRNCUU1nVvldaecBnHg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:49e5:5650:cd5e:e85c) by DB5PR04MB1655.eurprd04.prod.outlook.com (2a01:111:e400:5995::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.18; Tue, 3 Jul 2018 23:41:12 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v7 11/13] mesh: do not set offchanok on DFS channels in non-ETSI Date: Tue, 3 Jul 2018 16:40:43 -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:49e5:5650:cd5e:e85c] X-ClientProxiedBy: CY4PR1101CA0023.namprd11.prod.outlook.com (2603:10b6:910:15::33) To DB5PR04MB1655.eurprd04.prod.outlook.com (2a01:111:e400:5995::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e4b1af46-3751-45ba-c28b-08d5e13e761b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DB5PR04MB1655; X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1655; 3:fAZ1eTXI2GFwvep06ZhkifnNpUeYyEVUqGAGWr+RRPtNlBgQuBGpBxLm6XP0F3FT1sHIdQbxqgrzDYkYLxx1NpHvQWajIsKIOwXQTMfxrpO/ET3qdD7ptcMUvjthTmlIshWrxzFX15n1u89Pv8ovWlcX9eYnKN5qbmtOP2sYaJ6hqyTfiOX4V0gd/Hk12KwoDZcj7m44MhPIFxC3y43HegLkaPkSYeYFIcPXMdVhzgsy71JAa1ttJLi7RGb7OZe6; 25:C2csjj8l7pFzL1mC0QI4ZyU4sIobGexhjh2f8SflkIwtzNT/GvLN0PiXcYqibTJ4y/PSFak4ltTSbOIpLLnAE1z8Q2QsHyMR1fmbmbX2ZKpQrNVXhy9Bj/Yx4jvvzE70tyQcGwRg2TW1D1VL0yanB1w7mL+zz9eDP9N1rD1C0+d3eosk3MxI209wM/pEtqannT8ajlDsO4LVqo1d2JsGY3i02UuTf6dhlmLqlx5Kh6LVW34j1JOgPN65ZnmaE2LA+Xz1iMAE2uYT/uSo4cQuE4ai3nogAmpv8unL9ubMUXu8Qe3WfB/HSK/JWZyInBGhNjjMobfNYjy3ORCyzK5Vqw==; 31:82BTP5lCDkWkHHhd5h7yjbOLvSgfHSo41k85NF26Wel3VGsJ3JCj5oz4IBYlb3hjj11cHohhmplzOCCaYquJavUNci/C3N326E1JR4k0YjZZFZPGtL56zSXUX4D80g9Z4gfj0uwB474N4Y2Zoq+O1hKk88z5hkGg6t0aCrqY8I+mRinIk+TaCU+YmmPqsV1/GYDyzoYYcNZFkwreEhZ2beu1NphdODXxuv4hYsqLluQ= X-MS-TrafficTypeDiagnostic: DB5PR04MB1655: X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1655; 20:zXDGy0XUEfJlXwo3wfl2ene1Ifl2+USNeIOdtCobHkaM2BQOAuto/0eo7fPfPa5rOr4+wNaWMXitsPN8L8sgOgKrnE3CfFy3He7OMwEYv6sbwp4gevajN1WPmmrklRWKQyXmCYkUrR9FmogHucUlbKxJYfe/QWd2DY0r1GfUDtDJxHr5XEQ20+XWndANDHVHFPGX0/Rw6eLjTohFhUic81X0oS2lCeHxk725hb9FWBk9kQfo1Au8z/WRkNOgKqg7CX1F2mio26FZxpG5kieFr5/slnyvLLChv5QX7ZqN3kFl9mHdT9s+Dcug5+zgpKkYrMNHZnKPp5ankj7rIgeT0XozRtro1u/ydUBpEADxdd8RkKlQXHsUJM6FwgY+7RvZmdfjO1kg8Ss+seQH9LqPZkDUsBN2eYFLbjyTuMDAYWc=; 4:Z6Tvz/O8Ppvz5zFh8DA7Wi5YdtQOE81mQpRmlzHSGcYRM8Fj7zOXAz85YBZzRLvcAWU9Z7Ih55Oa1m3MSjh7kTs9O8XlB//nYsQM/9zVwWDURm8yxvHDCk595aLEWsLHP2HS5Z2qv/OQFIQPp63UID+P3G8RVjxwc4BggwVqDaixYirf/AkW2RToR7OPhwrNd45U/m2375XRtN8KGPSqUGzHuEoF1BkCO+hPSf8sflRNveEKzgsr+jGlaZTAtGh9Zxg4TrUVZ1ph/htUAE3AbA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DB5PR04MB1655; BCL:0; PCL:0; RULEID:; SRVR:DB5PR04MB1655; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39850400004)(396003)(136003)(366004)(376002)(346002)(189003)(199004)(478600001)(36756003)(5660300001)(16810700005)(106356001)(305945005)(7736002)(107886003)(25786009)(4326008)(118296001)(8936002)(105586002)(14444005)(69596002)(6916009)(6666003)(8676002)(81166006)(2906002)(48376002)(50466002)(316002)(81156014)(53936002)(2361001)(6512007)(9686003)(47776003)(6486002)(16586007)(51416003)(16526019)(2351001)(46003)(52116002)(186003)(386003)(6506007)(68736007)(33896004)(97736004)(86362001)(85782001)(76176011)(53416004)(50226002)(446003)(52396003)(6116002)(486006)(11346002)(2616005)(476003)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR04MB1655; H:smtp.office365.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB5PR04MB1655; 23:+xLH6NSLeUOwEnG+pg9tgjbKeCpTdSWgZ6ySVHCW5?= iX7FGA5FONKEme5OfMVOSso4FJoAoNKdCItBwLxpW3BKC+t6W6ucNyyd/nuW/kGc/Dccr77WK3HzxYAJikQHTUhPwgQLK+Ux13gXJkHYdKdKv4A6GiuRNdHSjhqy5A4Ek6MW5tKZzHeF4tic66FF18rfnMn417bNLOdIGVkTh6lSTFJPmuZW3S2Wyws4dyVL9l0srDUOu82tTluu2ARgYUhROMQsiHXqSFHAr1ZbBbR8Wa4myDVPLKcJXw+M8ZWOno9Z+ylYZMHTtF3tTMcAZL6Le0YUMxTF5APjQ4rltNCjXj7sxzZe0aywk8DoSmb2UciHl9lRB4k5GKZZJjqb7vs4EkKCHNS3HtBfWum4cfAMhyI2MzsgiPTiF+8Od1ScCjYOUC48rTTbiYjdpdjdP4NVAcFyZ4qbOKS1BKquHKtQOjhq1q/kC11ROwDiar8JKs9ieOfvwepyvN4njGGpOmO6A0lsbhMTEX+Kj/FVQ+OgbPcmW2tAN5hogiDKsZmPxc8+IGS7k0AJes0gCj/wUL0czaBDlYE7/VGUSMqNYrD8GloyQmvYvFWLXiyYMNdk9VuNn03R1+DvSv2F2Njrr8jV87qxLs1nGWMMcM3h28IAo202Sl1QqJeGoUl290W4y/qfU4BHqJDDIK3bEGtJ0rVQJX2gP0uD1FDOcFU5O2wjTR8WcToTL3WD/rqC3Maq156I6tV4GBvhfXFTx6x8s1dl3BmXgIxporBsW5KuF3L8nT9zDIbFLfiC4cgMGvFrHlxoJliAAVrMk+fnCNLnHTNNDZpFX0AiOevaTXlx+dAWdzbhVU0xSS/zRPucVLJPrjSeE6epAAzU6rzTEzgJ7wOEk+ekgPfL+dDfUonC+VftxaizgUttw/EXagC+f+i4yW+3LpxRon+Y4E7HAl6ab+lKckVUmI+sb8wa0Nc3gBTQ4Y+tethWEa7d+N8e9QV8veq1EGLGToSPfM0P7GfLZ1EmhnLzC322z6tBkRtr/W87BUL6gVgCp0BQFtPoyavjMzc7F+NY7JATeGZAlkOH/qvIqvHfqbqsU/B+kO3KZDudInemsKWcq37fhIkch9pM48aiHNbhRBzZqZIz6Plt+vrNGhFYSO4+18A2OkFAFmDxLvu3GuN8XCZZ9uYdim7I1+gf9vg1YEMaXe8sXaVbUwli32Nx9I8V3aolOv7NYVVkYYdld6j4RM9iXEcTPH4X/rOaW2YqX1qVJNwvVKpysB/rff85QyjwO/yYE7bS4Mi5RDASxWMf42ydtQmsviCrf/o4dtKdSbhTOGW0o2gXpibppW9fTEyp3cuFO4KwEdhU3EAbK/5XJ+x2qNresCt6Ec= X-Microsoft-Antispam-Message-Info: GLgCD0u4E1E0dyhhyUVBNagyfvTk3q2Gfw2IyUDBNHfGDpuAIBH0f4llRCi+uMcRqrm6MQH6yZlFZT6GtC+UZrkf5aVnC9pxQmZtr4TQG8iTIuqbS1c89c5Mj0pqBfeKsxPun2AsQqPi9/hRbMeT28a9/LErGvo/t89rzWs5U313ITUeJeJ15FHkoYaqnY1pybMjXnleUlm5+iHrJiIIgEbjRf/QPMGQLNrFNBProCDSAAFnZ0M4f4csY1Qh/ztH4IuPLogy6T6jOkCCMb03ZQ8XsFrRNkH54rhBRSO8Afj4HatIe1KGw9tUjK6DFe+K9aUDbaIJAF/6EZ47Up0ibLfHFw8F0Ef8udTD+CswK+o= X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1655; 6:QNoTkPqx9tQ6SlkCvAcj7IWliWYpPRfhnyBdGXOJBTKmwIV42tkJ2Llzn4Q0vXBIE/iul+Q8OeyW+gRrNIVUmY0r4FSt8/vVorp+ugKTEXgwZtWRqX5ysZWP99e2tbTxcVMRf4FcdFBIYioSB26yF7mTPw4GIKSKohzmWmHxXcjiWeDAlhpX1uZZJaljC74CYdOjJR4MhTd6dSLow+hONnPYtZsgHo1I/8qVm1WRDRV+/mNIAK9ePnRKSk4fUX4HUeA5OT7EusGRba3gXcuKlEhPn0jepxiRRsrq5c1FrE/4hUwNkbVLD+buzhNM966vKddRhjYsUs4O5iR8XDyHcceiIShYXXvBIAJf7Gl8GaCpojIGEZGATtv7waHVKB0K5rvhf7m8ep7WvpFlrr1bz7sEcBVFCVNRqax3T6zqGO9lD+CDFd+pEFnPE7Ozh/A5C0sIEUtKCsTo8qGg9hX+wQ==; 5:haTFhuF1NxcntsOF4aDzLd6/IDWazKeqMWpGqDHMIrRBWf7sXLUht1N1LKzusmqm64+Xk6ROwBP2R/9JANm6hAPD1JyX2/e6DXZkOvSnYC5irDi4gf4SThQboV06TGkJ0wcWuAqxHzv+b9iAu1B1RtAJqsXLwWdyXzKRsM4cLco=; 24:oNyavig9uVnvPRwbEvWqMJM/a0mzO1dz7CSeuI6L3NRoohODxwmzNxHqMZPVUZ+rUjR6gfZoAIbv7mxOtMDUYvbmpSd/5P4XrTTLT1Y926s= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1655; 7:NlL2fYG+5o7ONBmRkwgIN+Y+MD2oUAXxo0fonJRLowqxO3HGi0EAwV89BKym/Ig7/cSZ5uqIbo5JdXvnaSlTU9njyzuaBIYU1jjcFBbBDke9NiTGhRIXqKYSOy9s2yMG6iImxs3KCNYAM7bUJydV7SZ20tk9aXkAZ6V4FZAcHa94yl5wQy+stKVxZNneSgjd3pPVQJZUG9tMjRWVxGjny4MElhrjGiPUuoImGWYACtgLEjE7inuE0FJ93So14g6X X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2018 23:41:12.2671 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e4b1af46-3751-45ba-c28b-08d5e13e761b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR04MB1655 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180703_164150_411451_7142A6CA X-CRM114-Status: GOOD ( 11.33 ) 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 [40.107.6.50 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_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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 mac80211 does not allow mgmt tx to use off channel on DFS channels in non-ETSI domain, because it will invalidate CAC result on current operating channel. (mac80211 commit: 34373d12f3cbb74960a73431138ef619d857996f) Hence don't set offchanok for mgmt tx in case of DFS channels in non-ETSI. Signed-off-by: Peter Oh --- src/drivers/driver_nl80211.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 5cff47f..33c7781 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -7166,6 +7166,10 @@ static int wpa_driver_nl80211_send_action(struct i802_bss *bss, int ret = -1; u8 *buf; struct ieee80211_hdr *hdr; + struct hostapd_hw_modes *modes; + int i, offchanok = 1; + u16 num_modes, flags; + u8 dfs_domain; wpa_printf(MSG_DEBUG, "nl80211: Send Action frame (ifindex=%d, " "freq=%u MHz wait=%d ms no_cck=%d)", @@ -7190,6 +7194,21 @@ 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)) { + modes = nl80211_get_hw_feature_data(bss, &num_modes, + &flags, &dfs_domain); + if (dfs_domain != HOSTAPD_DFS_REGION_ETSI && + ieee80211_is_dfs(bss->freq, modes, num_modes)) + offchanok = 0; + if (modes) { + for (i = 0; i < num_modes; i++) { + os_free(modes[i].channels); + os_free(modes[i].rates); + } + os_free(modes); + } + } + if (is_ap_interface(drv->nlmode) && (!(drv->capa.flags & WPA_DRIVER_FLAGS_OFFCHANNEL_TX) || (int) freq == bss->freq || drv->device_ap_sme || @@ -7201,7 +7220,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;