From patchwork Fri Aug 25 02:30:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mitsyanko X-Patchwork-Id: 9921207 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 9CEE6600C5 for ; Fri, 25 Aug 2017 02:31:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D511204BA for ; Fri, 25 Aug 2017 02:31:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 66EDD205FC; Fri, 25 Aug 2017 02:31:49 +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 CB281204BA for ; Fri, 25 Aug 2017 02:31:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754542AbdHYCbr (ORCPT ); Thu, 24 Aug 2017 22:31:47 -0400 Received: from mail-cys01nam02on0041.outbound.protection.outlook.com ([104.47.37.41]:61440 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754450AbdHYCaw (ORCPT ); Thu, 24 Aug 2017 22:30:52 -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=UYARZDTuzoPf1YbIkKqc63kxyw3mH2Gj9Y7x1VjuUNQ=; b=mAHnEXOtkDQA9Nw4wM5uGPd8RLUb5UYAVLR2J/Rm0O+lbHVivEktL2H4tgGeqGwfboiDgOBWNs9tuJsjj7xNAqSgPayUNlWN3p7LqGbimSg4w5EIDRcAySKD1c7d2rETVfAaadzXKRiwBQXNdbvwEKaOytNDBMpU9qhvuE67uPs= 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:30:49 +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 06/27] qtnfmac: pass full channel definition to device on start_ap command Date: Thu, 24 Aug 2017 19:30:03 -0700 Message-Id: <20170825023024.10565-7-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: db3be357-2402-4141-bd37-08d4eb614cde 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:SL3avuUbuN2rxUnfNofkPN4tNhWcDoFHeQT52M+eWzNijhgnaAmIzJmiqNEdSTLxRdC6kmQwMm48bwXU8dHqhsyLL2in1Pr9bZ+nS9BSWdxAq41dC/AT+p3btZ2Mkocmz+yMRgIQa6avs37rLWmQnJ3787MlzBBiI9qCEEBEqyrc/fABsxJteVL2g1Q63VC6O+9fe8igvPHDjqOihW66AF2rQuSAA+/4RSPjO99Hw5vuVy2iuTz3qPUeWmmkkx0C; 25:Qz2ptf8nBozfOlrbTvYky+OHtZIB8SUeeVCNgY03dKXpRmssQgiinmoZ9rdh6/axoL1FZ150bnHuqtqiDhS7tb8iXEetDKBiRSGEyV8klPeaBDHh1/XKplHVDsQERvxHy8doTWaAOCcj6olIwB6VWYPY0Es5bG3uo40xFc+dXVm+HOyTMnfqyxn1JrFdZDbbBkRO9NmPlV6QmOWoJwoNteujarB2J8REhCpRSmM3YLBS3doHPZy1znRr3YUmwYu6iz0OSJDGkIt6DMTFZ3EQCipfC920VJJkoEApSKntmKJX/EnoZDXwDc8AF40es83KXoKXKE/d+6l0vvJZt3qTpw==; 31:RO1QrbAsx6KDfn3p8QE2/eY2PPojoUrAqOw712EDpuVItObwYjfKFmgySG4z9/1xSPwaAmfXSd2FY4mFXf5Gfd2RUICsDRmZRf5GQCQjxjO2UWP7W3ssMbFtI4VRTKOq71b6+BCxsuI1EakV50oQFdb0ZyWLtWgIj/IIrynvOdEsPzNFckKpvvgPab2XNeADf0OwxswePhY/nY+Fmib8bE7lDOV1jeb3GxDYNTvmhrw= X-MS-TrafficTypeDiagnostic: SN1PR0501MB2047: X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 20:RWweb4c/4zK+Bu/m6TsL3ALGSiyyX1t/7j/TCDTHXj38kP7YRidGV5mHxJQqmiJGU1cLXff9xjCRCuAwyS8C+KGLbymZqNBFSBd3kU5FFpkFxQhhNooFYIZE93UVDbUHNVHC7Msjxne1YuEju/39/LlVHecUI+WRufG0BvRKpAVGTha6eBdLCF+ybKrD+cK4pMd2kbEL0w5/V7Q2Hw7gpvVgrQnM5U+UasJV5B8+fmtc1AP9Jplg9rNen5xOh5jHpzBiDoyYVQKG8tcMED6D2G+a4Wb774WI+AYG2bbY6v5d9dSdYY/5Y6BemoyBkWaO7hEUj3UBBatMZAyysa8+6vNNeo10wS9Py4WzFuiZfzgzeurqoqBd2rX2KzicU/FVig0ElDku4Srz4MRrCdWSGm+5AjB62L2smXZMTWT3cq6Pv7G/VB6v4ZOnZrBGZnlLMrPqXhfmA6RRO8nhs0uVdT7O+Rtj1iAwfjw4uDfhlMcPztriX6f38GuEp1eq2BMgb+QDfgLLu24/N7ysdSDcwv7gEkeVwRG3gNkMNBsmV1skszdOFzcV58KZNjorFlJAAaFgQ1LbqEDtHOTIax/pX8egLQoNRWyJ6eEIjVRXAmE=; 4:WcCGMd/fLkFlXIESs2OihuWJi5+em6kDhZdpn6DJIaFdCTeUPIIqGWNZUKFHjENnZPjZkJS8tw/mp0y0WiIOiqIz1lc1OiM1r1FRSyU02CTOVnm5U9L5RhzOQaFmgRv8zmjMWvt4DKtC5nPF8kfYsJssqbqZHP6py2sYkLyMnp/mL7MQGk3rXZ+4DJElAopIG5DPcaWdq5klJYmkM0Lr7vhO7mGZVa7t03HJvoaowo7yufkviTTJl46nJxj45IRl 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)(85772001)(309714004); 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:QQqDC14nI+qPuWqWak6PtdDMQqpDEH1/3uGPkf+?= =?us-ascii?Q?ILZrLoFc3/UekKFYQ2aRWQXxyjZFGX300YGMp5mbWDHQ01B5OreAA5Au52M4?= =?us-ascii?Q?1oFj8nmtAQbVjTBaP64RjWVnYrWrwSbUlyKMxxIuJIexHRlks87ZMzsbufZ2?= =?us-ascii?Q?vkbot4a+FNSV1FvSXhAF/+/0WYW5cxiCfsn4IDce4waLOr9/hPGbpikpHikS?= =?us-ascii?Q?n0CE8BzDAl5zChngJgU3+Q2vYQ7GYGhHTGCi1fMCg+B3kiAompSj0nrybIO0?= =?us-ascii?Q?hm+Y8eRH8RWtSj0vK8nycB6kyEvEAybkolVgzi0ai8MrnAQjxgTFfP/1h4Sr?= =?us-ascii?Q?ngg3CcKabvR06Z2JaIgrsjJwACiJUJkoX6WglXT2na3rehKc6MOr4telbwsG?= =?us-ascii?Q?XNNrSSVXk2WO4c6suprjRf4FsZ8ox6VUzDykaY3/f1W4HFrlGXCSVwRCkaP0?= =?us-ascii?Q?o7wP25b0WE4lJlEduX53T81N982by31xv0H10RwqyIiSkc3rVugQKbCKQ9Pa?= =?us-ascii?Q?hK4u2BiHfqcsfGRnrwcmXUPR4Orhe2b6RiG0wS/lodAE5URKHbHIypkk2VmN?= =?us-ascii?Q?o0iqqkvgKMTGxQ2+l4HewD1T6LO6fPFD3vWEAiyrJ3yRjwiuYnOrdz7kIqYD?= =?us-ascii?Q?ImnwhUzHLS5AOEfCz5mhK+/T8mrqAWd3brO2eB5qKGjLW1/5N6Ls7oWpsYm1?= =?us-ascii?Q?CaiDxK58jvZiUH/DM7pKmY4cxFwi508m/RVU3cEtfFPTHTcZdUBSh1lWeSox?= =?us-ascii?Q?bSv9MK8rbeHpcRLk9vZgXQuTTK72uiq2XOJwDccx9CJApX+UNhpOSSXkQb0h?= =?us-ascii?Q?QOE3c5HPYb2LONvVngz0ZwuRJCoerZKjnOhLbZAO397ZYypZB1OxXHbGsPbL?= =?us-ascii?Q?9kIFCyzUtAEUVs13icEi1Z4D16GvHMCLKxa/EJIWOQhIAPrwoswMwLwUkh/+?= =?us-ascii?Q?YANqsX0BJzU1thdDcPoA2rnv3dhLgFVcOKyZK1woM0de9Rmnbk285jPo7cly?= =?us-ascii?Q?Hhv0iGcxCWt7YToaQ47zRMb7ysIpcHOgCKyWhI94LIU4soDmBlgG7zLIWerH?= =?us-ascii?Q?HBJCju5CqZqG+GZfdoVu1S/leeZ4Gw8TFdluLU7PMFmP8aqzwizjyZfzmA7w?= =?us-ascii?Q?UByHshvWT4Kvg6IL5wTrHqrsWnGAzQ4QK1hibt2UCpgNCwgKrn4NntJ293eo?= =?us-ascii?Q?zdELrk6dqyWBuLmoRsf1oaG5AWmvp5NK6aSUTPhIKEMdHFATWrE6+u1dz2Dy?= =?us-ascii?Q?2A0PAjtSRuFemqPpqH1L01H38NfLcSmyvIRLcRp3yt6twElQK9h4ZQ7hHAId?= =?us-ascii?Q?L+A=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 6:CQ5QCYerf03Uxz6tpWCvkBdl14FifhczZh5uN04h9qW7DEdUyG8ZYHuOIzP+WdUGCqJZ6x5ckPaLO7fQeiCVpwdFeZ1qIApGuuJ5XV6xEpHQuqEebxb7+3kIQWpgZkIX3dkuujLpiskKfJXtaA2IFYTDdgQhWOfHHDRqxHYTZ1ZjEHos86VCXMRVquwJUkmXzQX5wTqr6zcvOej0Vv+EPbydPnLaFw9Ib02Ac2CFDqqw0uf5+S4BXT8FTlcN4KV7rSxzySuPcbK/Y9g28pDumrYlur1No4HBjhfiuMVG+n4/6O8tASjY2PnYjbfBDMHhCLx1uB1V2N78Ppjj9EqdmA==; 5:9vFm32/kMB/XW0XvgIdqTJX14YcIWpCze0tob4oBJUNZO/tgZKRObX4rTfLKUj2smPdKdjQSkZlhGAcCX18uh+csfHmpXL8eFumt34rgW0ui1znKkwud/005ZCPh4iRvp7e3knVM6sltabbRgBErWw==; 24:7mNUuQqvDH8ndIFbg+tATJa2kCjd264rd99Yr16+rgplNqljHPpBuJCl3WraAIlWZYgIxG7MYOm/6HcXlMnAP7PW8w37fiJUjlCmsieFA+Q=; 7:auFMoQ9RmaBn5naBfdL209y/BcQoMPJvKVQkVIm5la67Ge5x8tuLOKcFCxzsT79d1A7j8lUyMLsAph2ZROmbf+MICDvZKnvcyJ7OABMba3M4+mFhnN8UpSSXSuTZ0ndrFBlT8E8wWirWbegjBVl1ZoRWygx2ij3N9KXI12lgnfkPBvMnT4sJEJJSQtXtuNKr4rJWXb7Mdw5bCzH+0cNeItFMT8WNn9hVlgGIGzvroVk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2017 02:30:49.4322 (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 Introduce chandef TLV and pass it to wireless card on start_ap command processing. No need to cache chandef in driver private structure as it is not used anywhere. Signed-off-by: Igor Mitsyanko --- drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 9 ------ drivers/net/wireless/quantenna/qtnfmac/commands.c | 27 +++++++++--------- drivers/net/wireless/quantenna/qtnfmac/qlink.h | 13 +++++++++ .../net/wireless/quantenna/qtnfmac/qlink_util.c | 32 ++++++++++++++++++++++ .../net/wireless/quantenna/qtnfmac/qlink_util.h | 2 ++ 5 files changed, 61 insertions(+), 22 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c index f6eb681..858c24f 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c @@ -266,17 +266,8 @@ static int qtnf_start_ap(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_ap_settings *settings) { struct qtnf_vif *vif = qtnf_netdev_get_priv(dev); - struct qtnf_wmac *mac = wiphy_priv(wiphy); int ret; - if (!cfg80211_chandef_identical(&mac->chandef, &settings->chandef)) { - memcpy(&mac->chandef, &settings->chandef, sizeof(mac->chandef)); - if (vif->vifid != 0) - pr_warn("%s: unexpected chan %u (%u MHz)\n", dev->name, - settings->chandef.chan->hw_value, - settings->chandef.chan->center_freq); - } - ret = qtnf_cmd_send_config_ap(vif, settings); if (ret) { pr_err("VIF%u.%u: failed to push config to FW\n", diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c index cddbb5d..7b24d37 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.c +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c @@ -185,8 +185,6 @@ int qtnf_cmd_send_config_ap(struct qtnf_vif *vif, const struct cfg80211_ap_settings *s) { struct sk_buff *cmd_skb; - struct cfg80211_chan_def *chandef = &vif->mac->chandef; - struct qlink_tlv_channel *qchan; struct qlink_cmd_config_ap *cmd; struct qlink_auth_encr *aen; u16 res_code = QLINK_CMD_RESULT_OK; @@ -211,17 +209,6 @@ int qtnf_cmd_send_config_ap(struct qtnf_vif *vif, cmd->ht_required = s->ht_required; cmd->vht_required = s->vht_required; - if (s->ssid && s->ssid_len > 0 && s->ssid_len <= IEEE80211_MAX_SSID_LEN) - qtnf_cmd_skb_put_tlv_arr(cmd_skb, WLAN_EID_SSID, s->ssid, - s->ssid_len); - - qchan = skb_put_zero(cmd_skb, sizeof(*qchan)); - qchan->hdr.type = cpu_to_le16(QTN_TLV_ID_CHANNEL); - qchan->hdr.len = cpu_to_le16(sizeof(*qchan) - - sizeof(struct qlink_tlv_hdr)); - qchan->hw_value = cpu_to_le16( - ieee80211_frequency_to_channel(chandef->chan->center_freq)); - aen = &cmd->aen; aen->auth_type = s->auth_type; aen->privacy = !!s->privacy; @@ -240,6 +227,20 @@ int qtnf_cmd_send_config_ap(struct qtnf_vif *vif, aen->control_port_ethertype = cpu_to_le16(be16_to_cpu(s->crypto.control_port_ethertype)); + if (s->ssid && s->ssid_len > 0 && s->ssid_len <= IEEE80211_MAX_SSID_LEN) + qtnf_cmd_skb_put_tlv_arr(cmd_skb, WLAN_EID_SSID, s->ssid, + s->ssid_len); + + if (cfg80211_chandef_valid(&s->chandef)) { + struct qlink_tlv_chandef *chtlv = + (struct qlink_tlv_chandef *)skb_put(cmd_skb, + sizeof(*chtlv)); + + chtlv->hdr.type = cpu_to_le16(QTN_TLV_ID_CHANDEF); + chtlv->hdr.len = sizeof(*chtlv) - sizeof(chtlv->hdr); + qlink_chandef_cfg2q(&s->chandef, &chtlv->chan); + } + qtnf_bus_lock(vif->mac->bus); ret = qtnf_cmd_send(vif->mac->bus, cmd_skb, &res_code); diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink.h b/drivers/net/wireless/quantenna/qtnfmac/qlink.h index 6814254..641d252 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/qlink.h +++ b/drivers/net/wireless/quantenna/qtnfmac/qlink.h @@ -941,6 +941,7 @@ enum qlink_tlv_id { QTN_TLV_ID_LRETRY_LIMIT = 0x0204, QTN_TLV_ID_REG_RULE = 0x0207, QTN_TLV_ID_CHANNEL = 0x020F, + QTN_TLV_ID_CHANDEF = 0x0210, QTN_TLV_ID_COVERAGE_CLASS = 0x0213, QTN_TLV_ID_IFACE_LIMIT = 0x0214, QTN_TLV_ID_NUM_IFACE_COMB = 0x0215, @@ -1128,6 +1129,18 @@ struct qlink_tlv_channel { u8 rsvd[2]; } __packed; +/** + * struct qlink_tlv_chandef - data for QTN_TLV_ID_CHANDEF TLV + * + * Channel definition. + * + * @chan: channel definition data. + */ +struct qlink_tlv_chandef { + struct qlink_tlv_hdr hdr; + struct qlink_chandef chan; +} __packed; + struct qlink_chan_stats { __le32 chan_num; __le32 cca_tx; diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c b/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c index 63a74b2..61d999a 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c +++ b/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c @@ -128,6 +128,38 @@ void qlink_chandef_q2cfg(struct wiphy *wiphy, } } +static u8 qlink_chanwidth_nl_to_qlink(enum nl80211_chan_width nlwidth) +{ + switch (nlwidth) { + case NL80211_CHAN_WIDTH_20_NOHT: + return QLINK_CHAN_WIDTH_20_NOHT; + case NL80211_CHAN_WIDTH_20: + return QLINK_CHAN_WIDTH_20; + case NL80211_CHAN_WIDTH_40: + return QLINK_CHAN_WIDTH_40; + case NL80211_CHAN_WIDTH_80: + return QLINK_CHAN_WIDTH_80; + case NL80211_CHAN_WIDTH_80P80: + return QLINK_CHAN_WIDTH_80P80; + case NL80211_CHAN_WIDTH_160: + return QLINK_CHAN_WIDTH_160; + case NL80211_CHAN_WIDTH_5: + return QLINK_CHAN_WIDTH_5; + case NL80211_CHAN_WIDTH_10: + return QLINK_CHAN_WIDTH_10; + default: + return -1; + } +} + +void qlink_chandef_cfg2q(const struct cfg80211_chan_def *chdef, + struct qlink_chandef *qch) +{ + qch->center_freq1 = cpu_to_le16(chdef->center_freq1); + qch->center_freq2 = cpu_to_le16(chdef->center_freq2); + qch->width = qlink_chanwidth_nl_to_qlink(chdef->width); +} + enum qlink_hidden_ssid qlink_hidden_ssid_nl2q(enum nl80211_hidden_ssid nl_val) { switch (nl_val) { diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink_util.h b/drivers/net/wireless/quantenna/qtnfmac/qlink_util.h index 416f11d..260383d 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/qlink_util.h +++ b/drivers/net/wireless/quantenna/qtnfmac/qlink_util.h @@ -66,6 +66,8 @@ u8 qlink_chan_width_mask_to_nl(u16 qlink_mask); void qlink_chandef_q2cfg(struct wiphy *wiphy, const struct qlink_chandef *qch, struct cfg80211_chan_def *chdef); +void qlink_chandef_cfg2q(const struct cfg80211_chan_def *chdef, + struct qlink_chandef *qch); enum qlink_hidden_ssid qlink_hidden_ssid_nl2q(enum nl80211_hidden_ssid nl_val); #endif /* _QTN_FMAC_QLINK_UTIL_H_ */