From patchwork Thu Sep 21 21:34:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mitsyanko X-Patchwork-Id: 9964841 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EFDDB6056A for ; Thu, 21 Sep 2017 21:35:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1F2C28DD3 for ; Thu, 21 Sep 2017 21:35:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D6D4F29681; Thu, 21 Sep 2017 21:35:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53D2C28DD3 for ; Thu, 21 Sep 2017 21:35:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751868AbdIUVfN (ORCPT ); Thu, 21 Sep 2017 17:35:13 -0400 Received: from mail-cys01nam02on0071.outbound.protection.outlook.com ([104.47.37.71]:39472 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751856AbdIUVfH (ORCPT ); Thu, 21 Sep 2017 17:35:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantenna.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=TX9GMuxvFxrR0dRF2jEkv1eL+mjIIc7Koix+yzodzbE=; b=WWJOxXSx2PWFpuLBLky5jPJtUOJuVGtd7oESPKrC7GIS2ZP+Yrf7bpQ1+eozKJ3g3s6+PQe/U9S7OznQLbQKy7gZSaggdY8fiqttQ3IOO88erwDXjEusUQx52zuV3mbcJQP5cLjtUOvO+XcafBuRAuefU40wB2/W21z2xz4uASg= Received: from dodo-dell.quantenna.com (12.131.200.68) by BLUPR0501MB2035.namprd05.prod.outlook.com (10.164.23.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.5; Thu, 21 Sep 2017 21:35:04 +0000 From: igor.mitsyanko.os@quantenna.com To: linux-wireless@vger.kernel.org Cc: sergey.matyukevich.os@quantenna.com, avinashp@quantenna.com, johannes@sipsolutions.net Subject: [PATCH V3 7/9] qtnfmac: do not cache CSA chandef info Date: Thu, 21 Sep 2017 14:34:35 -0700 Message-Id: <20170921213437.27457-8-igor.mitsyanko.os@quantenna.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170921213437.27457-1-igor.mitsyanko.os@quantenna.com> References: <20170921213437.27457-1-igor.mitsyanko.os@quantenna.com> MIME-Version: 1.0 X-Originating-IP: [12.131.200.68] X-ClientProxiedBy: MWHPR13CA0006.namprd13.prod.outlook.com (10.169.208.16) To BLUPR0501MB2035.namprd05.prod.outlook.com (10.164.23.17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a415f510-b6a1-45dc-8c38-08d501389fea X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BLUPR0501MB2035; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2035; 3:eJk2KpP58MLwjSyWXR3s6XRqfMmrTonis/8xR6vtKPVPlkGYD/LnmJ7cN1GKBmaZC0gHr/j9vskXnLNxlyKDMQtE09Of4ZbK/jmwCpQTPFdr2Y/w2CS3B912g/DGzZXJbU7/lczXtbtioU3cP34aPg56/miNM3+YGSrt8gXNvIdP0fAxt2I8wxuNwPRjiqUbt6JDXHRsWbOqyzIQ5eqeYinC78/svwhhCygQvcO0ioSwqOohIHA9wNJHGp244jNS; 25:daEyYM+w3YfYqkylF+2J79Jwt0KOP8QQTW6s+hmB7jIJ74hzmAjtNfzCwdcu0UhAH7TPFvsxbY3RYXWbLg48syAs29gs4DmKVjExQKZQuHuCLtH/S4AmHTFrDZDkotJPRkEHba1CLLbUwKi3E5KdfeDsfJqRdch3Yfg0nX0agOPrL9hRVCE2QdWka43reV72v0JOR9PVjhLtcw+QSU8nqd7EOnX44euodSUdisEEmzqG5KG2UfAgG+AAaol3M+B81k0VEbKCEOdVt5nCyGzv8V1ORS89T0gA6MkSsxhIyeCTGtbbbzb63+8qj5drtD6oaC7vbwVkBMaMFy+67SPozQ==; 31:F3he0cuZggoSrlqSHjRaT3+cbrKJLXFV0L+dNzsj8wEQZoNICPs/2aFKnNSKnnbE75VeXTT+16z+MRhd29R1llNu5N9PYYYt8aRfK667I/yAqvF9901PQUIOwMF0dJtzmy+4beqQV6n1ddBTPw7TbAGr7EdlWu4h5NylxOwpKcnz1AeFDVLwEulN24jxOKotlKGnMwq2/BcF7UCADNtd8l01WSKvUNVuInJiY/9/DCY= X-MS-TrafficTypeDiagnostic: BLUPR0501MB2035: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=igor.mitsyanko.os@quantenna.com; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2035; 20:iUP81jygKQQGgA+Zk4gaQ8QHoBFbdoDSZCaEf/3BQZ0bpnBIwOPXlP0/PT/TfHwvTXc1vjKMDz0529WuPl4du/bY0wskc6bXxFFsldzjwjjCUpKA4vSgfBgFRXmFg9p/F/4iwxibQQBEGKcl/W+8hl9ZjbH0O0VJe/I5SI4qxtO2AqcZabiPfjarjQRURcGS122xI55otC0+cQpO5JzckwgcLMMF3L4INHJhTCEq8qWlKXaVIsg8epsOVWUxYY19m1zr91ReLYEB7ow2jUYKPq6Ckp/Kb/GuHe7lNlWiTAvxM+hhmWxHweGDmgQdkxnkARCvEoigRNiJZmUHCn8DXk3j83GgEYkME4wGmxHEht7B/Bsp8EI/U1dCSCcUFzuILNlHLxxkQdv74N4npgu9EElF/0oog56rAksMjuAJ98YsCKPkeDzZ8H2VcLN3S1NwiD+UGqLpzzldCHTV68HBBWQv+09ZWCb+0jnkYkqXRUDBz/sIVXFFlxlS+hpUZffuTNHxszIxD5VMMlydFwr+DYiZr9IxncNife7NjVtf5kDswAHZn2PMVv6hJ7jK6j5bwRbBuE40Hchvp2VEmFCaUz3zd4qlGgTLRr7ZdMaJ8h0=; 4:s14iXz6ovbVGjHJ31DqYuEgM/G7Tix3SCVjs+rn+j8bZkGo4QR8FMOzZUob30eIs5SIwJwHhHWl33vrs5CW36izkEQmyqsBBKeSsZxXAqPr53RhRkRnFrBb4RkSXgaWTgoAklGf83/4/JkVhm2u9NzHnKXtuonmE9niP8v9wA5YCqf8f2IiSj7a4OEKR7e2NxEK4YWin4Q5S+35iivlTuv6HRjn1QrrRQJ/ulHF2gVLUwghvhIFK7UfwrvTVco0t X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93001095)(100000703101)(100105400095)(3002001)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123564025)(20161123562025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR0501MB2035; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR0501MB2035; X-Forefront-PRVS: 04371797A5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39830400002)(376002)(346002)(199003)(189002)(5660300001)(69596002)(81156014)(81166006)(47776003)(25786009)(50466002)(8676002)(86362001)(2351001)(101416001)(5003940100001)(8936002)(6666003)(97736004)(316002)(4326008)(305945005)(16586007)(53936002)(85782001)(7736002)(16526017)(1076002)(50226002)(3846002)(9686003)(6486002)(2906002)(106356001)(105586002)(6116002)(53416004)(48376002)(33646002)(66066001)(478600001)(50986999)(2950100002)(6916009)(2361001)(76176999)(36756003)(103116003)(68736007)(189998001)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0501MB2035; H:dodo-dell.quantenna.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: quantenna.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0501MB2035; 23:RHy0hY2KS5+sBMK1T/K95u38KlMg038DRfAl+bY?= =?us-ascii?Q?JJDdzYyafA2S37KfRfYJhNyddkb8lGQj7Lfe8+x/KT3B0ol6rFkL9KQVshvL?= =?us-ascii?Q?too0ULwVIOaPcKNl3/cEUb7Hj3ChbIt94Q+eVz9dC4ngBu6b//V0FI4I4Nw0?= =?us-ascii?Q?TO4NywbKKvtSQUt8LEblvewhsOxfVFISV93PHSQSeva+W5XAGcJIYm262jUU?= =?us-ascii?Q?dhcE6A8FNEXjEQExNVzAH7A62xnUiPrLUwUeTVDDlQq3mC4Gj0CEdGAyn0/g?= =?us-ascii?Q?DQn8uV/eCLy6Xr8eYP+8cuf2QdAyml4zImHjios0woSVxVbSkxqmKl6JJinO?= =?us-ascii?Q?DyB/j13b08hJF6QMMGuuXzBpYGDz12fGHm2nsIKbvtrQoC219O9W6KIp7v8O?= =?us-ascii?Q?6SvRa5RBu10WWckK8RbaTRB6fcaKfHRnGezw1btiVvgXoIHqLMLslsymfinD?= =?us-ascii?Q?SDZzy7rvBkkwUG110tk1ypoeUXGE8EapLMBoXoMRDkAZb9jvBwVNUOT5vXx9?= =?us-ascii?Q?OhgFJRMIrrWhyPc3h4kRme9b9Ks7IihY9fEcfyFn+JibfKH2Q6EK320gNNl2?= =?us-ascii?Q?me7sx21GILygsKpkrxyxDt6pkR05FmIJK3abSZHZIHMv3PMXtOgkD1LbuHqu?= =?us-ascii?Q?JmUJ8HNoiNZBJL+9bK0RvqU/O4jcLC6cv4SagCqnwiFaLUoWV0pHJ+9pegGQ?= =?us-ascii?Q?ax7WWZ8R+E2P2p+erj6mGsah+3l+Sr8pGJRccDTGyaBYG/+wTLbL9imnFdmD?= =?us-ascii?Q?k2PIk+j7xcnq55Qv5MultjFL+Dh69Yw7Oj9nZz97YKtIIQSOmsQ2EqW5zih+?= =?us-ascii?Q?g+xJGzxO5VAsZMGJmMY9pPhbyeEHFjLON5J3zB7UDuL4ypEMRTyft5prh4KN?= =?us-ascii?Q?aC3XHKwIepkcg4u9c4s2iZosiWwyP6Gi2ou+94LyY+Wit+dLA7NUcPp6+ZgX?= =?us-ascii?Q?H7526nbmXoVhQvpz76QTc/7lMVQE4QY5Y4D5POcCQGokKQxqIBljng49zOM0?= =?us-ascii?Q?fCgaBleONyovtvLVZC1gbKa24hFT4mMsnTvca/PwXlo09PlgfjFtqMQJif1a?= =?us-ascii?Q?kj8ENFHdQJnK6NsLQODSSPX7wdxZR4brNoakofnGEpYzv6WRqV8dmcy+NPQu?= =?us-ascii?Q?HqWxozDOG2YAnfs5m3/vQUTq4XgtzBHDSfN1NFGIwATajRz2kN/fLVLN2fO9?= =?us-ascii?Q?dI0c5dY6IIFcLwozXdclysI0hoFWWklp1+61MRD7bJiC6fdQI46SpRrHzUw?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2035; 6:yaJAzWiwXxDtCEr23foE+Y65eA7CaFzdjvBVn5VjDIM0MvB7Imf8EpPMaY9WvR8sEXviSTuyUPCDs32X2eI3oRu8hI5E4CGay8taSgzkFKYwtLA3qmoTPB9uZSRPgm/P6EC6u4ad5KbrICJ5KaUqY/zJsJVS4LuYHtnd1dqYhr3KiderGrxaBytzWCmKQSiA4zSDQhRbtljW+DsTInedaZ+bbS3uRD3xZ7shq9vwjUbXJfCnNj8WB86hbnkTb1R9x8lgNZgAz75m/zZPJgBAHJbg6fx7SjDL45eoLtjTtiTstgLB7o9/piDcJndqJ7RHgZU/6mgde9oj6BXpLfR+kA==; 5:EcFMRPrVDBGVe9M018VjkZD+XV8JJXyruJCKCEeMbVEfUGRlW/OAyRcOaWmCC3je7+GxH1kzyzJaFG9LLsdDC8Z9kyoN59cdfC4WR3AsNsp+6CiXsP2rifO5hpLbJRMpFHCgLTcdsB0MYwHHmxNzaQ==; 24:Js4ZEB5Uy8VFkUUCp+3iCZ0aT8WXqwiPKcNcfVrcKIsT59nYHBdiHt+iiCStHpwS0DnG1kvRFxft0yZt9Vox+HrVj+R6Ldbf0iNcr2tzM7E=; 7:uc8s6im0NWOCQBBjzfan21aCeiFlNpVKgzixF29Gkv8+FZv6qcwtCZxFn6FoPzm9eKzak4WUoRSAYvaDLivkQ8hPdPhk+hHdWbdU5aDChI63nbTyNWySI7UshmJvwHTzjbvSWZ9Il+Ou6rFrUveP8nn1+TArFzoXrStbgR6Dxw02GQVQPqrxCfBX0JBlbAeHMa/jaROPMyCX6LNIBD4+Kd9fdpyzYfaWfhjkafMlCKc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2017 21:35:04.5849 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a355dbce-62b4-4789-9446-c1d5582180ff X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0501MB2035 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Igor Mitsyanko It is never used for anything useful, and all logic is handled by either WiFi card or higher layers. Signed-off-by: Igor Mitsyanko --- drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 12 ------------ drivers/net/wireless/quantenna/qtnfmac/commands.c | 2 -- drivers/net/wireless/quantenna/qtnfmac/core.h | 1 - drivers/net/wireless/quantenna/qtnfmac/event.c | 8 +------- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c index 30f8be5..262e8cf 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c @@ -809,7 +809,6 @@ qtnf_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev, static int qtnf_channel_switch(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_csa_settings *params) { - struct qtnf_wmac *mac = wiphy_priv(wiphy); struct qtnf_vif *vif = qtnf_netdev_get_priv(dev); int ret; @@ -830,17 +829,6 @@ static int qtnf_channel_switch(struct wiphy *wiphy, struct net_device *dev, return -EOPNOTSUPP; } - if (vif->vifid != 0) { - if (!(mac->status & QTNF_MAC_CSA_ACTIVE)) - return -EOPNOTSUPP; - - if (!cfg80211_chandef_identical(¶ms->chandef, - &mac->csa_chandef)) - return -EINVAL; - - return 0; - } - if (!cfg80211_chandef_valid(¶ms->chandef)) { pr_err("%s: invalid channel\n", dev->name); return -EINVAL; diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c index 0138dad..42f7e1d 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.c +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c @@ -2337,8 +2337,6 @@ int qtnf_cmd_send_chan_switch(struct qtnf_vif *vif, switch (res_code) { case QLINK_CMD_RESULT_OK: - memcpy(&mac->csa_chandef, ¶ms->chandef, - sizeof(mac->csa_chandef)); mac->status |= QTNF_MAC_CSA_ACTIVE; ret = 0; break; diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.h b/drivers/net/wireless/quantenna/qtnfmac/core.h index 066fcd1..521ce09 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/core.h +++ b/drivers/net/wireless/quantenna/qtnfmac/core.h @@ -147,7 +147,6 @@ struct qtnf_wmac { struct qtnf_vif iflist[QTNF_MAX_INTF]; struct cfg80211_scan_request *scan_req; struct cfg80211_chan_def chandef; - struct cfg80211_chan_def csa_chandef; struct mutex mac_lock; /* lock during wmac speicific ops */ struct timer_list scan_timeout; }; diff --git a/drivers/net/wireless/quantenna/qtnfmac/event.c b/drivers/net/wireless/quantenna/qtnfmac/event.c index df58e83..77563b0 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/event.c +++ b/drivers/net/wireless/quantenna/qtnfmac/event.c @@ -381,13 +381,7 @@ qtnf_event_handle_freq_change(struct qtnf_wmac *mac, mac->macid, chandef.chan->hw_value, chandef.center_freq1, chandef.center_freq2, chandef.width); - if (mac->status & QTNF_MAC_CSA_ACTIVE) { - mac->status &= ~QTNF_MAC_CSA_ACTIVE; - if (chandef.chan->hw_value != mac->csa_chandef.chan->hw_value) - pr_warn("unexpected switch to %u during CSA to %u\n", - chandef.chan->hw_value, - mac->csa_chandef.chan->hw_value); - } + mac->status &= ~QTNF_MAC_CSA_ACTIVE; memcpy(&mac->chandef, &chandef, sizeof(mac->chandef));