From patchwork Mon Aug 27 21:28:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962654 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="FmjnimXf"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="Huixpj7K"; 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 41zlVw6sLZz9s47 for ; Tue, 28 Aug 2018 07:33:28 +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=C7qKGRlYuh5gLvLnvtNZ25J23ZaYWBejv5ESpS4O4Zg=; b=FmjnimXfh50e+y bbRGtf6PiyEP5aHbBoojDdmgTatXT5Hm+11UciOG0NueTzjlDu2tf5Npy50irAxtrGThOxmopCtIb 0ngoDPBTRFPohErNVONHJC/0k89T8aKUjq5OO1wnHySNcFmX62AO7noS85bq0iCCxPHr5p1Zj4Uhp AuQo2uHTYGdiHGFP/ybePX6wHp94LOypk5WBepIxwZUbb6WTSgdgOvAT0OsFIOC+MEKpnhA7xNxHq AbQRnG1tF9tf3GHeVPHo9c8TtF7tDMxVovnPUyFMVXrn7NX9qGBmEWNzwEAOIJmcO5BdAk5uDFa1a 1Q1+Zm5dRVUzXseQVSSQ==; 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 1fuP8Q-00017C-4r; Mon, 27 Aug 2018 21:33:18 +0000 Received: from mail-eopbgr50084.outbound.protection.outlook.com ([40.107.5.84] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4l-0006Rg-82 for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:32 +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=f67LyjxSl5hPj8DOhl4irzrYgal1EDR7urLg1IHW3jI=; b=Huixpj7KFzAf7JGRnyf6RvUvMPGeW4m/dV6POHUKwTt1wM7AVaJVxkeEXBv1ClaafeXaVOKePLVjHbsP3NUSVp57P6Bqfu8xJyIFi+qFNRf8ILYL+PqxJuJhek1xGBjxzd/oju2Vs6AmZZzvhgzCxtqfhM18S+2Wn/puJWJeMNA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:15 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 13/16] mesh: do not set offchanok on DFS channels in non-ETSI Date: Mon, 27 Aug 2018 14:28:46 -0700 Message-Id: <1c52bf51870d1c1ff78aa3aa9e7032087de0794d.1535403927.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:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3fc6b3c7-5359-49f1-12d5-08d60c642417 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:FIPNs7XKZx4pKH3/pZ4tmFlkf9fUuFkvPs2lUIGP12Wr0fodemMez+PKj/0rQjhxgKSXqnMPjM5lADVdatPrH2zrvzjMS4yALzLNvGyKcvmLYEISPofPn/pD4q5EqxNdG3DUMHr3LShIX7gIKufGajzk7m9rTdrvwyBRtOuXd1vrhOHRq0ezA7YYavZIPWZleyxjpL5CQVa7vs0XbWVEjlFhVuVQce2JEVBojACkzdftMzZmGrG6QqTdcTuaenx9; 25:U3Hq5nLBlc/BAs0IC7uIm5pArlXElU1kISB73JsDldHT4VK1USB9MEQcca4IDPwjEeiGSnMTjti2PUU3BVyBcziRqtC0za6enxEF93i2LuXuCYXO/O3SveojEo+4Y1x+9ObPCauleZX5AbsDFEMydempQGQBpIqqMZw/fMPEWx4rs48Biz5novcnScVipEApqwgkDZUrZGqQB3LFpWxa+ploy6tGB7ab7jBTuXrrsIx9r1lohLxGLfBGOG0Uzy6BpA+i0HZjPoFIK++RtR/FP9pCkIRRvLZQejOWwTlLnwi1Ru5+23kdwqG90w6LBLilFLhP3/JrBqVVrptxnk/6WQ==; 31:gYaAaIztzhsEtS3l3IAaWTVsmuawMWHKWkanjc0BvzoTvAZPqH1hN2LiPkgBnPpKa574oOaU2uPdjVJDig5oqiaFU0TKK+d6EyJg/0eOW3pvq1zSo1QC7bsNK+43Z5f/k6OCYiTcZ/aizVJkCVOy9G0Ner2R+UkQ7C/TWRXYnxGjbuabujdWyaUdSwpezIVy4vFkCOiRVAetJxN4jTsL9C+nQRdlo0ODt0ziue5Ph4Q= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:bofYjw7rdN++VMED8WYYN5kZLVbJ144Ij1VritxEF/FKRwMHLOSnUHdZ56V68dgRIPXP5kfGFXR35oJ0kE4Xu+9cX472ROwkKqtZCcG6mm+/02mnE/T7oOS/rpHOzRqNxV2eP/ECffC2jRLnDaNSIC4l0xmeizh6TeF4gz6vVV93Cif+xjaNl6ab77EfrPvYqHXWWbsQMlzK0OxvL/7b1qT6HDpjhr6OkGbCkM4tdvA91oas/7lf/SfO3wZ3LKLO8re5nPKdG9d96jgf+5WHSFch+59oM1X8gIx3Mzk5ZRGOcz+1J7QRxxCdJBQTCNkv5NnQ5kG9I7HvxzVd6ae7ISDHUKhCLMdBaXd00sujRNG9rLPffX5TW6Ig/a4zkKtjIU4RGnsE5iftNBiu6fdqaxm9oSbpIHCAZlxa1QEagBNPP+56UQgLyoWs9Eu3iTDeVDyIJPGHguWOZFuO28ImeCgl6sIS/6NNt3e29SybFpUBcteg5FgVjypJx9UxSbfD; 4:OrlDcXHHZyeammufj+lZHB90kFzZ1M/h7gr6WLQCLMic7DBenU66lpczZruqg12qcgczM1DZpBqoUvHXwd1qTYfnVI1+r7yVGP8rYpNaaCu07THLf9dbW6jhid6wPUGNeHS7+bGUrZmb725sh92OnyCjv5mxM5aw3ZEoGlnxdlsZLYn0vc0leN8rirNJfgTzKYS5376DpnOgS+cb6bMq2Hg6bln2LWfB7cdM8iCCY22lxESCIwzjfyjfPtJzI1Y9IAXhQSuBykQ0m3RQHPr3uA== 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)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(14444005)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; H:smtp.office365.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM6PR04MB4151; 23:/T7yRezKm2/BfBsJqfNP1o0erlbTwfgZcQN3BYKiG?= mN2T4ib9/eXLhL+FAGuWNfBN9Q3VHk5wOIOdulo88qVNcbArCpcrKN/ygi+ZM1BLTmU60TZRReBzfebLJXi7I+f6BdTu2o5+f+ssbkpn87OyakdW9J+X4i0Yjps+SUYX7GU7sr1kk235EhnmcGUAHGAr399t9seKjFfHo8/xg+8kIVxo7g2REgDJBaLuMKDIDbMo9ISllqogA2uH/XMTtHA+bV4RpT1G/6iFTinqnoWNF0CDueu1HaYia3oqC91KgI73XpH6hyR8Epz+pwrG8Fx3Mlh2QDfgGOVbwXTvQMMfx/ImZxFSVU4rBgjcut4bOuDIeveAgIF47wDmSiVnajNKBbl3n6Z4lzF1R26MkjyUULGaEU2iiOl/HwdZWpqvmpbUgPkm8mfQXVRw6y+eBwesjHAL5yN+s9XAO+J7EyqzL3ZVO/xlvhCuTZViEhOI7KTQjmUMp6FBzP4fQXqm+941bIz0dSR/rmy3N4LZO+uvBzic6mM53xISBkXeztJTDx68Vdei++LmzlEgs4zHxhc0d6xIsvT8YQatRGY6aU3k+8E/uAx7xDypJSwscVvBEiHCtYfPGFSa89ReMqhsqtKmgqqrnMnJBL9idlAZFjGhjgbGrJj1d1v+N1NLtobiGriFyIGcovEDgloiOwS0Ktnynir4D7OfNlm2ZT+EGulwmtigkZwbjWjYnZpW29/x70SU+hWvEQ5prikmJV7JWLiOvJkQ6pfo52x/ZWdNtA6eAbV4VsYExSUlRjLoWNKpyykeVeHol+nn5VDAj/8a2fhSV40xng/CQyDrxXT+BnSXyl18SmrxoB/i7O0kxMuhvQFRAZJB7Un5AK6g6lRMaMxuEsHjrN+b7M0nDtKEjbI9Bs1XCAW9k0U2RTE+i8D1wsimtj6okagIcHH3apUt+InEOjvVqGid3gJaPL9llMP4kiJ3RP9gQFj7+qK7laTiNeNHqBl4BOUVaqaFBCmX4fV8PZhFer9NRt/hYiIFaMRdJN1aq17U53E6UCxFWY80ZqIsvvsMVepiCbP5DHZWoI47ZPghyZS3UBcZINZEW882nOjU8MOmfEnOTX3SqAAwUE9RkWWP0BmBrlo+dE256EysPfXguj6Dx6rYQSUw0w/IKkpf2KdA/NsJYgE7ASp2tg/Twq1zAVfX0eR5qMoj8XR69djT3VgeVQtCRPTMQH8Ks74qnh0UDSwGzYGpXTrrBWrTQxRJcu/o1lExtCKArc5VJ8YdzDQfF+6FIoINH+tPopep6xeZeNrhJrmbVjo0q/BcZM71LahK3is/QMl35QVn5+XDpglEE0UfsnNz8M+z+keiIiHlO94wgf35utDVYY= X-Microsoft-Antispam-Message-Info: +Y2S3xWd+DJCmDI+6MOXkY/QWgCXjI7Q2fo1fy+vmzMpOdazxOcZVE+5xJZc9M/z45ahSLfR8T46h4+8WM5TLaOFW62+4FI8Szk5wivESPBn+k0egC+eI+cPRb+o1E63fU6PHv/UFl7OIL3dy8wVwPIkMVSOgIrWgkbHCIVb1LceSRk4qoF4ARi/u3uXdgO7x0RtpITil281Y0MF/EQvfmFJeaMknogn0n2cbMIh18lRG6I+XuuuiLDjNmNWfoFZ0kG2+/udTJ6s25anxvXvkQG86PNVgRZofZo4gi5wcCcO/gWBRcPx8umD7cmePuCG2nN7Nsu8cQAA1IsReCouW6vpn2xiF3ucA+YxoIHunGU= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:WXbvdJVMD0r/yPrWHznoqn/6af75zHwMmFfDOPul0nzaoJh62a6A0nS8k4BPCyCJgso3p8jetyep7AaUZ8aJe7arBNx5cK6hMUndE9RMgGod0Mw/fqUP7US7tUkNYakis92cfMeuDbsiUKx0bmitD48QOv1mGyGrDL/vlPIl9LZIq+6A7ArvVPThQn+cOhn+x3S0s0ZAde7UHHf7FnlNJJ+5yJxHj2vJLDlMdYZnKpmxujI0lDuuyUPa0xXvF1gnryGF3Tblh1ckFFBwteZVZH0rP7MZzn4vVbPWkHe/HB2bkEDNXQq/66KCXYiwjDc2JFtE3JJb4R5TunXy9qsKDZxhqCF5X7zIdWmOsvKeHAE4JHwBx8/Qatcmb0N3niU1Q6QXvDqfneFGvRa5HWV7pw9JXwZ25Qg05UOMeM+Mp434nTQfXvHS5ftwUfvFUikDlpqwKO8v2E2wG5K9HyYoNg==; 5:WTu/pqxomoJbYsZv17pojefk/hMFkkhIn91kqwq3QlgEs+BweYpW0Uux71g7ZLS2xzWWrIHgB5DpEWwh0G5W5EkB7P3FqhLevayQNlsAQ1wcav8fQbM+3u6G66c9+5B81V276NDyL5LQbqGm01/m92Qx+Q77N5TjOf/Lt/kurFo=; 7:c1FTz0X1nnjZnLrtAp1QPDfAad6dEwUzbHO2wMD6aCDkRE/lDYPlhsqaT1QDS1ysjAy3tgNXhDDyDiqe/GNOMCYnZEFKy4cRtG3SMAJUW2s7KfgJ9ykoDFuHOKY3kEVHLLVHD+D8AHV8tvz9lEp98VW0ZxKBa+pA2Bi8VajxxEWeKf1jX0mJxPj/koVIegihYREnRPr7n5If2MkjCPzzFGXA5RlHR5qS16krrSIdOTTahF3dXsZzIP9rR/Ezf0sb SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:15.3233 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3fc6b3c7-5359-49f1-12d5-08d60c642417 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142931_431018_48183E5C X-CRM114-Status: GOOD ( 10.74 ) 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.5.84 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh 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 26df43b..0af109e 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -7178,6 +7178,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)", @@ -7202,6 +7206,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 || @@ -7213,7 +7232,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;