From patchwork Tue Oct 31 01:04:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mitsyanko X-Patchwork-Id: 10033515 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 0A57A60291 for ; Tue, 31 Oct 2017 01:05:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F002E286FB for ; Tue, 31 Oct 2017 01:05:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4E9128961; Tue, 31 Oct 2017 01:05:19 +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 6220F286FB for ; Tue, 31 Oct 2017 01:05:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753117AbdJaBFR (ORCPT ); Mon, 30 Oct 2017 21:05:17 -0400 Received: from mail-by2nam03on0048.outbound.protection.outlook.com ([104.47.42.48]:45504 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752728AbdJaBFG (ORCPT ); Mon, 30 Oct 2017 21:05: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=y2GBfn0W38U3+1n+MHigIiKXXSQ65UasctAyDarB/24=; b=KhNGET3y7XoxhJbT0rWdO8aWUcSPJIQru0TT0gIGE/9DJnzLcJAc6vtyu//ATl3tY+PDZbwXUlHXjtFEnwV51UVtxQVQOCYs2hP7w/fFKe8fTEdsOZjqnQjMd8V0fm4Ig+0VTKpNom2ILnQjS6CVgOUcqPURL2SDAsOsKGdDC6M= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=igor.mitsyanko.os@quantenna.com; Received: from dodo-dell.quantenna.com (12.131.200.68) by BLUPR0501MB2036.namprd05.prod.outlook.com (10.164.23.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.4; Tue, 31 Oct 2017 01:05:02 +0000 From: igor.mitsyanko.os@quantenna.com To: linux-wireless@vger.kernel.org Cc: sergey.matyukevich.os@quantenna.com, vulyanov@quantenna.com, johannes@sipsolutions.net Subject: [PATCH V2 3/9] qtnfmac: get rid of PHYMODE capabilities flags Date: Mon, 30 Oct 2017 18:04:49 -0700 Message-Id: <20171031010455.27772-4-igor.mitsyanko.os@quantenna.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171031010455.27772-1-igor.mitsyanko.os@quantenna.com> References: <20171031010455.27772-1-igor.mitsyanko.os@quantenna.com> MIME-Version: 1.0 X-Originating-IP: [12.131.200.68] X-ClientProxiedBy: MWHPR19CA0008.namprd19.prod.outlook.com (10.173.246.146) To BLUPR0501MB2036.namprd05.prod.outlook.com (10.164.23.18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dfeedc79-af71-47af-9ee8-08d51ffb6ae7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(2017052603199); SRVR:BLUPR0501MB2036; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2036; 3:T/j5I+9+IxyupdocNt/wRdJw/C0sX0GT3CvtO06lDz7dF+HDmvxP03sA8ToFC9SPtWluuKjmHkaUT4wKVtZj0p4gre8izzFU0ZNFISHh0nS/DvB30WPh7lxllf1YYPjZOfFh5zE2S6RmEXeLjt+IOEMRDr5OKXSzMIL1dE/Iaey/DRwKEN8VINddh/K0rrS7v7YWsnfeFXpSiL5mbdFZhgLCpIfqbvJN3Y1k04VnXQdj9vl7zOvzf0eXLd982R5L; 25:FI/BXKBC9MYGNoXZKuD5eu3zdSlJIxXrVvv810WCeizrk8TK7jt71V+iIdVtznNZvbGTWaxeHa0fNw3yq1n4H4Uw8N3ACbW5zHmH53SkqPju8mIum6PTeGOwvnFd8eWd2BD7JpjjSyXiDK4MhNgF5q+KjOK1xI9eicZLRakZfmVmwpJozuRBVEnJp1ThyD2RkUlke7+T330/RWx1yTL7cCRVVJJL2mvvCeh8pNN00Leiqg9Zi64iMbKZMnrL3TMu0Yrj2bFnfpyYIAiVSu0CJ594YDKibme/29L2sUPlZlRPJJ7nH9Hj9S5JYoB3E4peLgoqKVzeDZ0el6WuFrGMYA==; 31:wo8DCcz8J8ROnk0vJT7sni0Of1G7Ih6Wjq3P9MlVWo7BKcL8beA5yHS2vtc1z00/7FGC8AXTa99aqBQw4fGCHBU6n92uTh5iES7TPsgGV9fbrNknZ1b8ee67Blg/j+qVZL3i3Dc0Z9Vu4IlfNiRtRwmXSguuGqUxahnST1lB2nDzCN57G64Ahdckq1C6Uaw87oSmKcTV24TYN1VUdY5mNB+225f+9l/xmplm0DfIp1s= X-MS-TrafficTypeDiagnostic: BLUPR0501MB2036: X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2036; 20:rxgDw2XV3G2eHlI6nofirTfddGkzKvaklXIMAUjlvi3wuCoHuMSjlyTud+4Mf3ZrI3g/PTQmhNnAePS/uW52jPG27DwGyGpB+BhhDFjXcMchPA+F/YK/WM0OsBIo3OvNuRwNwV7jEVI3MPBOK/op1yBIKv6eEQcbTa3BUf2sGzAbRz02nWzUjWvDrYmjn/6AY1Hcv6z8OIG8Ch6uruwXACmolN4T4tRkvFJQUWKkvo+EPURrWyG5jdDt1gwENKNU54C80tf+nSqwpOCEKf36l9w+jcs0la7vvHXiohnYtWMZcWkQsOhSadIOCGe9YHXQ0+EpmKsle/qy35lRGPp5sZUzunO065C0nifngNjbKGjILYcHvWL4Jaj7LSY2Io42PA+MhpFeudBae8PjqgbOpDuPibaBpFMBNjnMOxjtn7klgGEHOaL6CjvX/9WbiWtGhJJj6Ptf9h47s5klFdTH7LIbw7c5Sn7mOgI/vWUpg78FUcbKmWS5xoVPhaJUdq296BVzSlXHRCD1BuS5WL2T4UZFGpRvTm4ETZm3RN3t+d8DgOEZkAH7Tp8xVUrf00/xV/MGn/u7MzhHa9HRqnRy6Lptn7Z9XJn0DwYJ6Cb60V0=; 4:zGpV+KWqzOrcb7DS7mYfZVJUg7nnCvR3/hc+egx+sp/CX151PqI5G5aQWUKtc7WpDDKYM8c5ghfEFeKnVeWjSlzfRtrQvV6XctBFFS2fqlA0eOIZuw4AYIcBuAwfrCU/aPSMXX9rdlLk1LM7cGcWvbo0zRPKiCl8Rj3EyH/l48vdrr9ACXB8GADKE75jHx4nRDg/8AEjMxSZxX2WFoJbje5ru+BiYBG3WJJhH2BUiAO1XAgc2NtATTOR+PjeyFTAHRTeynKewqlAh/BV65zDJw== 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)(100000703101)(100105400095)(93006095)(93001095)(3002001)(3231020)(10201501046)(6041248)(20161123555025)(20161123562025)(20161123560025)(20161123558100)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR0501MB2036; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR0501MB2036; X-Forefront-PRVS: 04772EA191 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(376002)(39830400002)(346002)(199003)(189002)(9686003)(5660300001)(6916009)(6666003)(2950100002)(478600001)(25786009)(53936002)(36756003)(6486002)(33646002)(85782001)(50466002)(103116003)(48376002)(4326008)(81166006)(81156014)(8936002)(305945005)(7736002)(97736004)(68736007)(50986999)(76176999)(101416001)(6116002)(50226002)(8676002)(2906002)(2361001)(53416004)(3846002)(575784001)(86362001)(189998001)(1076002)(16586007)(316002)(2351001)(105586002)(106356001)(66066001)(47776003)(16526018)(5003940100001)(69596002)(26583001)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0501MB2036; 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; BLUPR0501MB2036; 23:7tbqfuM9yby7tF2ra6H39pKsUbKNiWhmvxK3cvL?= =?us-ascii?Q?zXaew+ox3BggNe9ub3AAKmJEx+YVVEZElj0O1e3XEHHcwFzFfs3CDpF4l2NE?= =?us-ascii?Q?9Ug3DS+HdCnY94sEP0UBjQtShC1+lpD+0+5COEk4YE6Xhx2JVVccGjP1A7hY?= =?us-ascii?Q?b8VYc8MaZsptWkSwJF0byopwaUAaRthDJdr/tEv03BeMTk0NNrXc5qAMSpwW?= =?us-ascii?Q?3zwHWWmXW0hmVzbff+SxM3L1vZcd6Vr4KykaoA4yZ+p17xBhlQ2M9WZLomsU?= =?us-ascii?Q?77zqtb9ISbb22YBwW1LHlvdlpR0hQTofiLPmSfPCRqGYgcwSqr8OVPfqpGiT?= =?us-ascii?Q?DAnAhZmDUihEHUJKjoWjPA6wFAZTlaYrI7e0/WvSoeJ+lIT5b2t5uydEs8OM?= =?us-ascii?Q?Tq7KvFDxpcXQI3bO0nR/Y7+bdYKqWynB5Df9FP5XL9vwOUKFdOrhpofYe6K8?= =?us-ascii?Q?NuiiBkG1XFa/ZFb8iXODucRpY3Mg5WoatBdoQUgktsEpbaHCLCORHad62QVC?= =?us-ascii?Q?NFRg0t4aqb405XchKhXHyj+lsVNcSrAH/Xt1ZDqGaD6jw6WD7lYp8DJ8rrIZ?= =?us-ascii?Q?V7MPqqDytCPsmHCZvCHhthoLZZ7dzSdPbe3Lb+cz1eivu7ljwpZmJ7bSIrbX?= =?us-ascii?Q?ru+Ie8LCI1N2uqTtN1+BELc/Rxzm9VD6vrbyzJqLiJh/Ob2zDeAc4DLW/oep?= =?us-ascii?Q?7NY537RV706rXhkpZrSllvp7VJQ5C6pG1yxLvpAR3fKce5iCcVBVs5Qj090V?= =?us-ascii?Q?rskL9Ip7qyfcTUoh+frXzecrkFbr1hKS60uo0bn1COC5nYISa+/6pGW44D+d?= =?us-ascii?Q?pEzso3HdST85v0XIUXtMsYljKO5ZddB8ej3lD8UKqByW2numrV9YWZOHiVN6?= =?us-ascii?Q?2NEtgcJ8rE9bAZUnNKct1D9GT7mZFcUtzSp7IDHXjjXI+1R4PU8Zmc8Vp4K5?= =?us-ascii?Q?UXW0cLFCRoRk6BFNlpawN7emooHiCvI4/POlbmJ+XTB33/vNTne5gdPF9vzD?= =?us-ascii?Q?lWoyJ0SskHT+ytSLeJznCp2sphA9MbPpRucaNXDqLKRRs7GG8waB3mKXF5lS?= =?us-ascii?Q?DrxK2hIjkSQ0PWoiEYU8rj9EwHcPm6MyJUHExe1uEVAijYb/4Jcrqf/ncKjZ?= =?us-ascii?Q?lsjj0solbi17G6Eez+O/AkFl34HmAZixChnLNcF3fy0Ndh5wwwt1uosjiQtQ?= =?us-ascii?Q?rqc58N8ZZz3kbIOPElvGFMQSfAOZa5yBv1S1a8+vTaONKPYJLydaxNa3McwQ?= =?us-ascii?Q?yUdjXdbRMyKqCvu9/sXZQlvFVGEKs9DcEYiSU09IA?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2036; 6:A4cCp8rKAWXL4JdDVppTapfCp7rDe5Q8dp90lbis4ih4m4Ab5sgdVAPdv9cXfQgP71JewlzQkx4cC2JcqV3TOp6QVVw99dCr6FK3LCScMch0RKFb1iUGp1f9U6sDD2uhAla7tFCVBjZaSQy4WM+sv5x2TRTF7eN77T2L1QrzUgd/MuohSTIuFIhu4AxBKm1JKo+/5JiOkBrL9eNWPXI0SZ8CV2pqgTaQuSWcP+imKpBulpC3QE3hGgjqU37MGm9DzTKha86z7bZLSjO0bF2fSA8Em1OgINy0oY8Ilvgd56r75JeJaDr11ODCMtGFZCVBQKtiQtOOnM3UTRhW8kJ2MTEVAMv30PEiVrW8hSe0fFs=; 5:5Ghnayiy6vrSCrXzhiPFZwexJFUEjjRMBQ0Y7fiOJwrGiky4nucHFz7Diro+iCC+7UPnE7DOirZfRAk8JhvitfdT7FaMlFVqGwaSVzTRCRhKwLemAXJ5jH43RZVppvu0SouNVNFQ/4uMtTcCPP6t6p/MhsFFzJZYngB9pT7Y1Gc=; 24:LxN63q3Md3u8My6W5HtBTpZWor7gN0FcQOF5AyZlBHy4XLEtdoiKYU7EhjU5MjoxFs3ftKoIEafKmJ1Frn7oUR9sI5p3qfp4vLSI+Pk341g=; 7:oQOs0YQeqbrRBYQ/7UROnCFLuNiYWfmuMCOS3/vUhONwaFlkKG3dpbOgs6epIEseKnX8QN0uFd6jgcQj8iwx4sMKW1fDEcMhUhYOvO1a5g8YEG8R3KE+XBCDXXFC3zHp0VXPW6oaEcBBHSkks4qKDQKnPzl1V7qUh4WWBbFQwcuy+mCPAu2mKmR5NgfDHKm99sJW1Qc9DhTApi8LRwcjB2lJeleF09aLh24ZMw/i6oiBYBm3KrRav/ClV3ng+bR6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2017 01:05:02.7359 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dfeedc79-af71-47af-9ee8-08d51ffb6ae7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a355dbce-62b4-4789-9446-c1d5582180ff X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0501MB2036 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 b6a2540..1a0c538 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c @@ -891,9 +891,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 35ff7e8..503187a 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.c +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c @@ -1090,7 +1090,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 74b94ce..1b7bc03 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 b2c4e27..c558d81 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/qlink.h +++ b/drivers/net/wireless/quantenna/qtnfmac/qlink.h @@ -74,12 +74,6 @@ enum qlink_hw_capab { QLINK_HW_CAPAB_STA_INACT_TIMEOUT = BIT(1), }; -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, @@ -639,7 +633,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. @@ -651,10 +644,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;