Message ID | 4dedf7c20249035f3fa7972ddf4c32d6029be82b.1527628707.git.peter.oh@bowerswilkins.com |
---|---|
State | Superseded |
Headers | show
Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> 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=<UNKNOWN>) 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="doun6oJ2"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="Mj1gc9Co"; 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 40wRZD3y2gz9ry1 for <incoming@patchwork.ozlabs.org>; Wed, 30 May 2018 07:24: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=x4yRbdzIZYaY2JCw14m4zXLt9/i297bb9CfnCih5RDU=; b=doun6oJ2IBLo37 FWoTWujgjm/Qw2KE0V9j/uzDGC+uUpOUfisWjtTPbKrNTpHD0zp1wIQZTyE6afjXePTSmrIHZcizo 6Fwlg87CBflNtmhwL8HngXXj3lhR4LpoNva0jR/2xFu9HkECz2WYdYSlDdDi3RavnO5jfDHHZdv7M B1Ly+tLk6qm6RWQ6tqBCQMJ/abGBGiNGy60JlRu28d7GiwqC8FW5Pu635bTUyyYTlAK3hiVPH6MDO FrXhEraY0D0p/PD3AGP29hs2bCOZon52DHU0iTVgkLPSq0YCj7u/PE3sINKVdInnCknx+GbxaEpF4 FeB7WX4pilI3TjQXGHwg==; 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 1fNm6W-0004z7-PM; Tue, 29 May 2018 21:24:28 +0000 Received: from mail-eopbgr10054.outbound.protection.outlook.com ([40.107.1.54] helo=EUR02-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNm2S-0001JC-Qh for hostap@lists.infradead.org; Tue, 29 May 2018 21:20:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bowerswilkins.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4famcR+lEgTKR3r69zD7jilxzziGqmw0MTOW6NAlAxU=; b=Mj1gc9CocGWah86WXH6fCfY5AAqeORiC/1V5cmMRYGbIZqxkXX0gwS1Qp1eFO4w/T+qzH/KvW+rCYU4Vswd8aaT1nsTy4yoNEaI3fCiqGakd6UwUA2n91it1fEGpCk3+VkIfdt6LTiyOK02sY94Z5j0o1E+xxHtmmlI2iwGVX8Y= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:bc83:1bef:7e2f:6957) by AM4PR04MB1652.eurprd04.prod.outlook.com (2a01:111:e400:59e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.797.11; Tue, 29 May 2018 21:20:01 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v4 15/17] mesh: do not use offchan mgmt tx on DFS Date: Tue, 29 May 2018 14:19:15 -0700 Message-Id: <4dedf7c20249035f3fa7972ddf4c32d6029be82b.1527628707.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1527628707.git.peter.oh@bowerswilkins.com> References: <cover.1527628707.git.peter.oh@bowerswilkins.com> MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:bc83:1bef:7e2f:6957] X-ClientProxiedBy: CO2PR05CA0101.namprd05.prod.outlook.com (2603:10b6:104:1::27) To AM4PR04MB1652.eurprd04.prod.outlook.com (2a01:111:e400:59e6::14) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM4PR04MB1652; X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 3:xqvk9skEjEIwFZcaY428ITt1SqhOF7blEcdtoD74FOY26dWdJ7VuAZgHWYd8knBi10mrS8LM/w0xV3v3Ih0op8dvcDm3Dm93hCZHYSZYJHMq+14GmukrRGRFOIG0l/1pgwIeGGjVIQDjpuOf+I0tPyB7I7YBrYfl61PUwuBwd20OxwuCwhdltKf0wgk3gCS0a4zoPoY4sC/mpdeRe5RoGZMmDCNt9GUke8HmPUAmobnwa03OVQjTqK/WflE4SUvr; 25:tpwGOaKef7IfRr1ZL8kJiaktlYtDRujbu2wkmHB/VUp1gitIzM+wgEaOVUiyM4xuSX66NNwSu5AZI/M6bCDuIY/Jt6F20a37zp2MBa9K8vJVGNQufAY42Qf00jCHgb66WUUwsuDaoLcQxg9RNaCZNZC/61okabysv1/8ja+NTVNbNa2R6wd5cH8GIk0INqiBmMF7zisWN41kiXLwsgiUBGE+OTn2a5fFNm/FW3CWiJSfw6lDHa2XPJoKeONQ56D5lL/AdUcDlPcSxP2XnU8oCZyaZAFiWaEZJ2TI6Bl7FLOmJIcjrez1Pxf/Q3GH4GAH8bmwN41NMTgpuFipxiLxwA==; 31:pu02nfPj1mPEFC/ZNprgPsoVu4Omr+w+6nbHFyxg/+zD7NpjoD/csPyKftAonGtB1MkZJg6+lNaHVdeX21G9q7MKGRnDj6z0Q7IjjJaU6vBSeDUzSpRWqssTp0P49TZT55BLj96mX8X6bz5yDG2w363Sne4jwrBrodyBjEnbiBXppUseuVDZbkD2dSBBr9lqYLSmSFKeJ2EGxYRbDBrgk/hNWq5GXENV6SIXjmz1Pg4= X-MS-TrafficTypeDiagnostic: AM4PR04MB1652: X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 20:oTCA2n5uDzc1M44NlkD0lr37zAFlhMzdA8L3zyQ7aIWyoLFH9Y5Pz+tq0UUMfkWnBhuATGduqFggUY9pMJsAJbpgPN3+lRndX8/tuxgpZDhoe8KY0jGvUJ7iM6S70w9rMQe5un89c45MYTnyQwdmXw9PW7URUMo84Sga8mV7KrGDBFglXmAR8S4VSWdiFaBt66DAtay88u7RcRgIx2tfAXSMPb6uG6kB79Wk3SKWerJVFkFa9B7ShjQCzQH82xWpciApkfPhM7OYP6PR/pbw3dw2JNQ4vGxW7lpzNJ83bnClTjlU3y03xcZpvgHVxYhiGrmaATkaV9R7qBjmcNhR7LYxuJbrz0d1PTVvR00tyJaece16osX3a8/AC1SVmPY1Cr3xhuh8pV3fIVlI5uskT3UyAU9i2PVj4wIOKkW8F3g=; 4:4V8hHzgQ2Hb5/NutfO9zBn+HcwTtAHDsV6YhEZOszUTqg9yyWJR9+vCM/dWIfGbQ9wFmCbdWGiJURPLTL9JbZ/zJ7bhcW/nvR3uRkHMCNSJ4lSWOWWqeo9klq5EP2X0s6QPb1rFLzCSBXM3oX+A/+60bu8LZOiaVMorRG+Pt1UnNN/5m+UNYAXLjqePXaoN9zQLhEJQ2hduS20PDXbcmRpwoY2bdf5D0G53MTudB2e1lUscLTzXxiYrIAk8G23eKcP3ONISBojyNnhA0LkSOCQ== X-Microsoft-Antispam-PRVS: <AM4PR04MB1652F58C90BA3B6F299EC3C1996D0@AM4PR04MB1652.eurprd04.prod.outlook.com> 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)(3002001)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:AM4PR04MB1652; BCL:0; PCL:0; RULEID:; SRVR:AM4PR04MB1652; X-Forefront-PRVS: 0687389FB0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(346002)(366004)(396003)(39850400004)(39380400002)(199004)(189003)(11346002)(446003)(68736007)(51416003)(46003)(486006)(4326008)(2616005)(36756003)(69596002)(33896004)(2906002)(107886003)(6506007)(59450400001)(386003)(76176011)(52116002)(52396003)(85782001)(53936002)(6116002)(25786009)(2351001)(118296001)(2361001)(47776003)(9686003)(476003)(6512007)(8936002)(478600001)(81166006)(86362001)(8676002)(50226002)(50466002)(16810700005)(81156014)(316002)(97736004)(6666003)(106356001)(6916009)(186003)(16526019)(53416004)(6486002)(305945005)(7736002)(48376002)(16586007)(105586002)(5660300001)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR04MB1652; 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; AM4PR04MB1652; 23:nws7Y0CW5zOJTiGUP18LRTX4aZiuf78DKPNutp0VN?= sS5oFLRN/ejvtpr/iEqc2wf4DtvPFEnYMmEtRBpqFPBECD8o/ZKr11lzmLKoTDKVs9OyHH/cpy67Uo1KcAucf0iapr3lEnPIgQ1lqay2bGiXweNGAI3Deak9SB3VOTziChoSb+szaE4bnLbzAXKGR3HO2tXBLSokzFl7O/Lg3VDrWeXmNF1YGRJ6NnFZJy61gkHlpR34nN2bKkhCAi5HCOzwK4xMxb26Wihg1eZWqcjg9UM9CsPWWtvXARtuAz4VletowhHbGOl1JJD1134i8hPt1U2VotIdiDdUrk4IT0Yco4qZVldci1GIK8VCec0qXgInQmhwQ1lP+++q25YGMAFOrueJ+VwLNsS0gOnDIybeE1kAJlKbVP9yYghhX93pisRneMYxs/6vkaNSu/ovNdVxv9nnMjPmfO1222WsFwcZgc4qaOjo7dplNYdBD24lhhRJEYcBhWXb60IbI3Um+VDMVBt7UuT5Z9lFYEKLtKpYZafi804oSm5N1rC3iJPGXTGq7TZSOgVBvRv1dtoZ/U8ztACj0XdneA1JRtLPKBHlE2PW+ulRqXdRaHtstTZKbmzGEKo/WAxi6Uyzdiiax1rBG2cX5UfNnOadWwGs6cPdOLtN4dbO3BFQ+HfmcO/7+Y/boG4BxozPV0GWOozLKUsU6Y6NgS3IjeTyIxZI3BudiH6FUBqJFkMN9mLcu+eIpayeS+h5G+D/8tuXaMgYHfjIpfpT2DCP/l7Dud6u3BOXNK1NfO0/rh9LKzLEC4A87aLUrryxX3r++BZPNQCti0lw+578Oum7OfJNqDEIB6sqBmYJtPvPWTmYCkd0Ty3a6LzX5/Nbq/sktAdmY6a1FUABA2jNAUQgzIbO27POAbrFVHY5VH6jdDqHZv48Fxa+alAugB8JDb9octbXViNXGeK2tX54ueQipSYTjwdoeGIDXl3mnY0KQ+4K/QMZ8K3fQuf6IV0kgFr/JzBlDXhqTsez7KG6FPK83xyVUCihvSbYc/MwMViMI7LmAWou+uiqHZyo4QaPb08cNy96mVF6Gg49BvwZqbqGG45PJqWPFSSdIxq+WUtVMyQbOU0ZS2Rdb9iI6W5fiBozZnHMcZfmtmWvhiV2vRoUZpSOU9K+wqu5IIrtax/MhbF8SEeu1BhgNoBWVmQ7njMTeXhFFbBS5GKj7kuHBNh/AcV5oGoUgDPfUwa9DpX28h8Nzh1Q3DO+1TTpbZ0h2RZxA4u7VuDU00+PP9lkyiVSbYuHzNtAp9rzA4/0HBLGgCN8OfwRSQGr7Bs/R2tm2bK1JUDzQ9pyjkXf9ZfhqmHaA1Co2VcS7xjRHlulwCB2GGVgVewunTrvxYJQQzV/7+u0W9QZjQOq36X X-Microsoft-Antispam-Message-Info: LSf/Pe2j2LjFHwXEkDWtzxhreYwKTSTtn5px9LrAxJ0clnltnPkA4f0i9+RhWah+CfMINAYThjeFGvVgSFXMB8OXxT6uMXY5PnigrgcVShKaLxd2F6YzJaYJSa5y6QJ7H8d/gyQFUWy6Fkdxjp7FK3dOMFJpJ/43KIJsVg/3lm9ZPUYHZ0sKh5/Vc4syMTuz X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 6:64U5/I9vFnS5tnzYt6atylehmdn01Aj47V68p+zipCo3eKu4ibd1jHbimdrQouQKroled9wR9kuN3swpTNHhVMJgMSBa3bXpKBMKfY9kAu+d35Ms5ptjtdhObhGaXnv9EBlc3x1pQ+ynjwDlzKP2KttyVspvEa/kG4HbBRDlrM2+E9bukkMbm+ptH+sMuDuDEl9lErmoFpnh/1gYb/4AmCDuB0mq6ZdI3iwdPkS0kD3syxw2/A70qZ5BVkvBrWF5MIaqIuN1x/JqXmxc/54xSV+kYW82ejqTw+5pu9gmE+Qck9tD55z5bgJQohDUX4t/xmlItjdVbud1PUdvolAY6mTIawFgL28A8ds9jyi9mtceXuFOovxwvhmsmY5ZPZTZaPvtaDIlP+3S2lD52BdbabV1NpnM/9LmUF6WH62QOGvk/6TUCaUL52TSpmwIFEoJGBLCDzzbedTz4ylJ+Kgh5g==; 5:CVGq51fT6e+PCBVN3EQjxSt6F8X3g4e/himbRFbLXouXSKICm5Q5/13+NaElUonRPU7e+mG6TqE40BUGofcv+sfOBmn52YN7EPQDlmOiA4XydoRnTd+bAslEHWPQKNYuLXOIeFzk5wLxxAqajZdAbqdR4p6xAKhHLXgZGj0JcjA=; 24:Wi13rdnp+BdkTLyv3Q1yCv1D6twCHkQLX6NRj6iv8BlnRCBKWwDA6hRhmglFCytD/N57qWTcEuc82YBb+8cZqxOcqyho+ER5qbtyquIX/3I= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 7:UblyUi457f7kyrnK6b84yklZDMxOaXTEJQnVQJYTQZl78ychIRhZxZSaqyAq+S3F0jk44aZ9D1wvgRIwUDuFEI6ahMuu5nFx7jKH8/yqolgVO1xLcKulBgh8n10xUneLhgLtXqAt2sqqaxGFw2iza77oumV6MF2B6sWM1AWqP3fYFVI3HSoGptgwF8efp4AXKz0T1rGjXwJaoNLBNQuJ7L9nvrbMYjb4lERhunSxhuLy+0Wn7fzklqeFN0Rk/xDb X-MS-Office365-Filtering-Correlation-Id: bb3d0106-2114-4164-9c50-08d5c5a9f0ee X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2018 21:20:01.8031 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bb3d0106-2114-4164-9c50-08d5c5a9f0ee X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR04MB1652 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180529_142016_897781_ACF01C49 X-CRM114-Status: GOOD ( 11.15 ) 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.1.54 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_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <hostap.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/hostap>, <mailto:hostap-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/hostap/> List-Post: <mailto:hostap@lists.infradead.org> List-Help: <mailto:hostap-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/hostap>, <mailto:hostap-request@lists.infradead.org?subject=subscribe> Cc: Peter Oh <peter.oh@bowerswilkins.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
mesh: enable DFS channels in mesh mode
|
expand
|
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 916baf7..5dbda41 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -7165,6 +7165,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, " @@ -7190,6 +7191,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 || @@ -7201,7 +7204,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;