From patchwork Fri Aug 25 02:30:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mitsyanko X-Patchwork-Id: 9921191 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 B7093600C5 for ; Fri, 25 Aug 2017 02:31:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9ED64204C1 for ; Fri, 25 Aug 2017 02:31:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93A44205A4; Fri, 25 Aug 2017 02:31:32 +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 222C8204C1 for ; Fri, 25 Aug 2017 02:31:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754529AbdHYCba (ORCPT ); Thu, 24 Aug 2017 22:31:30 -0400 Received: from mail-cys01nam02on0057.outbound.protection.outlook.com ([104.47.37.57]:63780 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754471AbdHYCbG (ORCPT ); Thu, 24 Aug 2017 22:31:06 -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=J6qbV6FoKUIEUkTZOUYx0GsaMnd67Xz7LW1NX+cXpSU=; b=mQMOzWB+Jlj1FmybK0jWVGh1qfn2eBM1IphvZkvm8CAVJbbasTaNoFJ0FAZRWHIV7talk1/wKVwIGmBu/8Uuu/ugG80hkNDM4CZIPxuujEw7ILwuKhkysXAO9Y6D2sndwRFjHkNMl4elG6ck/eBNv1DAeDUxK95epUbRodYOFMg= Received: from dodo-dell.quantenna.com (12.131.200.68) by SN1PR0501MB2047.namprd05.prod.outlook.com (10.163.227.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.4; Fri, 25 Aug 2017 02:31:02 +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, Igor Mitsyanko Subject: [PATCH 20/27] qtnfmac: get rid of PHYMODE capabilities flags Date: Thu, 24 Aug 2017 19:30:17 -0700 Message-Id: <20170825023024.10565-21-igor.mitsyanko.os@quantenna.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170825023024.10565-1-igor.mitsyanko.os@quantenna.com> References: <20170825023024.10565-1-igor.mitsyanko.os@quantenna.com> MIME-Version: 1.0 X-Originating-IP: [12.131.200.68] X-ClientProxiedBy: CY4PR15CA0017.namprd15.prod.outlook.com (10.172.74.27) To SN1PR0501MB2047.namprd05.prod.outlook.com (10.163.227.20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e59b004d-38f4-40fa-24a5-08d4eb6154ce X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:SN1PR0501MB2047; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 3:VvVcX9MLK2THXoBnR8VuP7meL2PY7wmOtvBTW6T1ZZRGMMlwCUTA3SZuxUBTybKNHfuXCmgpxqC4d499QFsALYURxPE/VNPdivFksjCE1THUPaSbVoqPAgFCZ+u71Gd7AnKuW0qNQ4a/xa6joODRmxtEhXzlw+N6DzR1nZ8JhYjEJ8pTlBeFTkYvayeYlor9zCexiCJzbpnkPCDaAvDVrQWTlpeqEGriCFkTSmaA2JJSe/Wirc8zTDHGgcIuZUGx; 25:21aLdRDjp2VynOvNvoLv19RtKFsO4JibmS9iU4r+cumcEWrJeGhTYBB630O/pyx8naZWo8deHrOD+RfrcM5UGA7ZrFHVpQezVo8lYe5yeyA00Mjm3OVjPYU0ACx5gPc/sNu7wmBIxJaGkpmyCOk6FTWJNh0+rvSfpmRI4gdsWXMQUNDRelslbue7yyQM7o9Sj8rtR76tMcFayprlDpCTFwfuxia9qUnVMQI/5amtUGhBd05WoinA/hyXnPyUy5y/sDZtG0T8T5sF0VoFV80x34i6ivMNCrGA+GUSl4J7UnaGqDoc/46mH/Rj1R785TuQ6Oh9/50JyhDmQatWXA899A==; 31:FjJcld6V8WIskebbUVgphWWSDcq0TasGcNttsBL6poIS9IN3DaxJcyuiICKairwGY1NtVu0q0g9Yte646xvkiYo0+TsyVfMIXEvoKjKfus2wKxuJykgc6MDkwPrSL26pppaD9yR0Aa4mtp78YC4O8xSIO6UHAi1tfLWA24LolE5uVwQCiwAw9FOBHe9C6tRc9ta0N2hESESjcomhWd3jGXX2Fcue6Svii/0EQqky/6s= X-MS-TrafficTypeDiagnostic: SN1PR0501MB2047: X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 20:DuUy50nu8eUbs1Gw/3zYIwxS5bH26cBh6hIapvKcHrq6dII1PnrqpdF1IiBkiW3OkhInElSFTMszfSBAeeJ2DPsz2j09AyIzJ96usj2Zv8VGeb8g9Nwps07hThNxvn2IjpYr+mwYX0hr5+P82/sz1Id+hwjcN5M8oaezU4jG1mj0+Z0NqsbCmtbj/kMkBANLm6aqMYead+mRH6HeULMDVbixcgQ5QEGWqf77w+J4m9TFEty2IR4W6qnrcVMbnrUgB8i3ZnR9iV65prwPazMQMiA649Z+PtOM64nR2coD4TPl/JQXioz/GnbmgW8jwU2UkGHncQBxpsc8NShuGVRz3+D601rsa4gPQJzl0bXwZ43ivg8zZAAayB1wXT8WLvioMfZ9nnzAwH7W5qauR+gqP0hYJzijoJHoYZ2RcGpuB/PvVbC9EU/yTtrIufR0TYUr4XYJFGN+z+cUQcSN1mHyY0kQbUhv9/fUzQSO4NhJlhmtkMdqtY5eKTUvA1xR0bMY+Z0xXF9jqNNfFJa+Fpweiq5JA5iwn1IBMe1lGNffa//G7HDJDXYUEqi+q0ofFKC1BQ0u/Ird/a+up61WO2tqRMmb3ZFW1u7/GjsODUVnpho=; 4:gK6d9uybDF8oiVrbzoropkrRz1qYWbLb1K4+4SfaQeU4r8e+KEPAuZfvp/yWrA2imJYTVKmOE+bhmdAfeDs9b9vAe1vOmiCzINIFMKByr77rp9EsUSZOEnudysPThUCVkkegCnwYPDd5smMR9zHSxDUeKMlxubjdwn3OH59NP6fdjXtSdhgGwmuEOx4fcXcgNRCwTNbymepYqXDUa/yqigTpe4bGJgJaoWcstZQVjiviyf2H9u5b0sWQyJImmsmt 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)(601004)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123558100)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR0501MB2047; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR0501MB2047; X-Forefront-PRVS: 041032FF37 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6009001)(39830400002)(199003)(189002)(76176999)(53416004)(50986999)(110136004)(7350300001)(6916009)(6666003)(2950100002)(47776003)(2906002)(9686003)(53936002)(66066001)(2361001)(106356001)(105586002)(2351001)(86362001)(305945005)(33646002)(7736002)(42186005)(81166006)(81156014)(107886003)(8676002)(103116003)(478600001)(85782001)(68736007)(50226002)(50466002)(3846002)(6486002)(25786009)(36756003)(97736004)(5660300001)(1076002)(6116002)(69596002)(5003940100001)(101416001)(4326008)(189998001)(48376002)(26583001)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0501MB2047; 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) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=igor.mitsyanko.os@quantenna.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0501MB2047; 23:9cuLMhD6FsWSsMXRPv1fQssLMqhHjeJ2g0AnjGp?= =?us-ascii?Q?87KK7uDyRPlg9E0WH/6IDT0LJ7eEg8V5dmbNaoGrF0pScIhyRpqiEYbO3FYA?= =?us-ascii?Q?R8VbhffYCIsHW6c+Lp/9Zk1QCAXfUbrlNZ/g5nQyQPAN2W1UHRx/zz4YuLH4?= =?us-ascii?Q?JDfMDyWE/j/9Q4qiGTNJn6vUFqxX4UcEAX+CMIgvU5YuaQSOhKau8CZJw83U?= =?us-ascii?Q?4Cg3g1XXsqltERzkqIi8kdBwurqN0c3v5ImIoj0LhXp3pSw081zs46ruUcRP?= =?us-ascii?Q?tVqMj9HvEkruRBY343viOaCgOV0TahOeOYZRRw5+TvyXuWvGpGlA8GTrxgmW?= =?us-ascii?Q?w0GveHXvhQQFSOtn+vRvwaaO/YJdWZn/imp2M2DKCHgrUD0AWaRm6xkY6foI?= =?us-ascii?Q?VnS3nx89mSvXmfYO4fZv3K2BmP/zLr10MBqWcmDGs9K0QrJvMmED0ZklsMLe?= =?us-ascii?Q?uVDF6c2fTXFeEzwcKLS9G9nzXDX8MDHGtnA3Sc3lkyGXMqmnfdC+SrJgN3DT?= =?us-ascii?Q?cl2gT8v+wJzlZF1iM3PM6gtujTAYlkVm7ZzyykUTbKYdIR0ir9LKDQPpCovp?= =?us-ascii?Q?19lvRrF+ZfKk7htYU9r1ouHWQo+cJuLz0lKx7ZnFpBiq9ZsETjDksQl+apYy?= =?us-ascii?Q?xt6e5awjz6lrWHr4Qy7UL6owiVkSviWHGrJFDWmWSkvQY2cTqE/sW6P0ogKo?= =?us-ascii?Q?K4PIPySf2Qy69zgvuK0Lu3nzHDjzLvRNf8GhUt9zwBotqn42XMfAv4NOOq6K?= =?us-ascii?Q?Brn9iKfu4X63VmQGK3d2dJ4Oc11VmTFbUqhqTG17YK2qhUqnPabvxO+UpB4d?= =?us-ascii?Q?ODdM/T6vRX2tLizlxurxNdjbbDgz1+wKMGLmjgco+5WDH7SuVfivZSjjuBkm?= =?us-ascii?Q?XZ7YvaPHzG+nyu0wXbWg8RvIQOP3bWvUqS3aRf7CkIjkqRm5TBf48ryj98op?= =?us-ascii?Q?9If8jxEES7V5rAuvOroW71pqjsGQJfjrwWte+n1fS1Xxg3xqOK6ukgklw5JT?= =?us-ascii?Q?cl7HDs1Str8bg6Z2jYWbsenlYS9yEkUO6iJ/cP0nK4WuF4b4MQM6DKwAtfbd?= =?us-ascii?Q?GhS54tx7NrJXhWH25TLmc3nrZkyRDHwSZMF9KlZ7CZ1tdSPqLPVMlqOcvIsS?= =?us-ascii?Q?qvM82hRBuPGLU2j+Y/TS4rafOOFWSxo4ZULP889i3IY4TC8hRVcLOyVibx3P?= =?us-ascii?Q?wXH2tCoaqS+Lzh5ckXVqad7nQU+UQxTQR0kQlP9+Hmt+He0kyGE3u7Q8/Z6x?= =?us-ascii?Q?jTzF/tE4/rK1ujkCiF78rLncfKA3kK5VGC8A7bGdrqXocsvYQv0zT6R89FGd?= =?us-ascii?Q?/MA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 6:PPxrLFR/kWnYuyQk2ESrI7YXjRkNWXzX5peOBcpjq9+CgRCM1mngQKZ5wpL0zhvdtHCNAh3MRb0O+VmsJzr/QRNOYJoHh+5YFgTW9cvF1i71ktY+tPps4bwDJ1N/o1/4Ye9D3L+47UacSxJYuWp9qdh2eigAJiNRtqcjTCRCdEfAZUdbRM6Uksz24qkDa4xIPQymbKUEhNa4+vP5sOXwiuHSnP76QLqFUwJ2/BwS5Kf1tGam5rDOLQVbupZJNxcqOBCTrIAuKSi3iGe4nKrl8+N6se8YDQKGukWyTMO4vn2NmXEkLNAFImDb+aF2HlryVBh3H9VnrVh9jhqTfXV5cQ==; 5:DUyyDc1bfWXB0rnt/znu3JRN8HQaV8OY+hX11wrx+nUiZ8YnLabanOXymy0S3IBiYpJUyDZaIqvJkF3UeprY71wRdXn7yEbpQsR9Mz9igxE6DsTclVDJbbPrixGBhOzeKp0+ZHhUO46GpKFoPkYOrw==; 24:CYn0qOgxeL7SOp/hbhTAT6/hMh/VReFMU2qXbc6X0TD4ish1GDrk69Ir/5grUxR7gAC2odOvmUXpAPLRujki3wrj2y3OaGgN/SaXhKrTAW0=; 7:gbobXO5qYCL9iCVNv8vr+ESY4QBvZAllimIWhTptDYFPTTXtpBrsk4NmOdS0ky7RjX5mB0bpikMtK13l23wq92ck53oW3bnoJv1Fkd+kdRkXXvn4bQkX5FQd7lyZ6ja3JefjqlHeuBKowGtlSmjsLccJ3eBIufO+MRjLC84H3ymCjGy6v0w1aVtMYzEGLmHMwSjVwRvNYRKWaVdpTJDX0zjljvzmPMQSiVGzWyhVKMM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2017 02:31:02.6983 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0501MB2047 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 Supported WiFi operation modes are now identified per-band based on HT/VHT capabilities of each band. Signed-off-by: Igor Mitsyanko --- drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 3 --- drivers/net/wireless/quantenna/qtnfmac/commands.c | 1 - drivers/net/wireless/quantenna/qtnfmac/core.h | 1 - drivers/net/wireless/quantenna/qtnfmac/qlink.h | 11 ++--------- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c index d6780f42..3faac7a 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c @@ -879,9 +879,6 @@ int qtnf_wiphy_register(struct qtnf_hw_info *hw_info, struct qtnf_wmac *mac) if (ret) goto out; - pr_info("MAC%u: phymode=%#x radar=%#x\n", mac->macid, - mac->macinfo.phymode_cap, mac->macinfo.radar_detect_widths); - wiphy->frag_threshold = mac->macinfo.frag_thr; wiphy->rts_threshold = mac->macinfo.rts_thr; wiphy->retry_short = mac->macinfo.sretry_limit; diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c index b26cd01..79a3e75 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.c +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c @@ -1088,7 +1088,6 @@ qtnf_cmd_resp_proc_mac_info(struct qtnf_wmac *mac, mac_info = &mac->macinfo; mac_info->bands_cap = resp_info->bands_cap; - mac_info->phymode_cap = resp_info->phymode_cap; memcpy(&mac_info->dev_mac, &resp_info->dev_mac, sizeof(mac_info->dev_mac)); diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.h b/drivers/net/wireless/quantenna/qtnfmac/core.h index 3e74736..72d4298 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/core.h +++ b/drivers/net/wireless/quantenna/qtnfmac/core.h @@ -92,7 +92,6 @@ struct qtnf_vif { struct qtnf_mac_info { u8 bands_cap; - u8 phymode_cap; u8 dev_mac[ETH_ALEN]; u8 num_tx_chain; u8 num_rx_chain; diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink.h b/drivers/net/wireless/quantenna/qtnfmac/qlink.h index a9f410b..e4d3e7f 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/qlink.h +++ b/drivers/net/wireless/quantenna/qtnfmac/qlink.h @@ -65,12 +65,6 @@ enum qlink_hw_capab { QLINK_HW_SUPPORTS_REG_UPDATE = BIT(0), }; -enum qlink_phy_mode { - QLINK_PHYMODE_BGN = BIT(0), - QLINK_PHYMODE_AN = BIT(1), - QLINK_PHYMODE_AC = BIT(2), -}; - enum qlink_iface_type { QLINK_IFTYPE_AP = 1, QLINK_IFTYPE_STATION = 2, @@ -630,7 +624,6 @@ struct qlink_resp { * @vht_cap_mod_mask: mask specifying which VHT capabilities can be altered. * @ht_cap_mod_mask: mask specifying which HT capabilities can be altered. * @bands_cap: wireless bands WMAC can operate in, bitmap of &enum qlink_band. - * @phymode_cap: PHY modes WMAC can operate in, bitmap of &enum qlink_phy_mode. * @max_ap_assoc_sta: Maximum number of associations supported by WMAC. * @radar_detect_widths: bitmask of channels BW for which WMAC can detect radar. * @var_info: variable-length WMAC info data. @@ -642,10 +635,10 @@ struct qlink_resp_get_mac_info { u8 num_rx_chain; struct ieee80211_vht_cap vht_cap_mod_mask; struct ieee80211_ht_cap ht_cap_mod_mask; - u8 bands_cap; - u8 phymode_cap; __le16 max_ap_assoc_sta; __le16 radar_detect_widths; + u8 bands_cap; + u8 rsvd[1]; u8 var_info[0]; } __packed;