From patchwork Fri Aug 25 02:30:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mitsyanko X-Patchwork-Id: 9921163 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 13C80603FA for ; Fri, 25 Aug 2017 02:31:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF5BE2022B for ; Fri, 25 Aug 2017 02:30:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E41DB2026B; Fri, 25 Aug 2017 02:30:59 +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 383302022B for ; Fri, 25 Aug 2017 02:30:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754470AbdHYCaz (ORCPT ); Thu, 24 Aug 2017 22:30:55 -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 S1754438AbdHYCav (ORCPT ); Thu, 24 Aug 2017 22:30:51 -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=8iABQjclj0gbaYxUnXAW88LFrdVkZ9ixB5fH6P1njDU=; b=Huuijnwr4LW8mVKusPFEWXnw5wWBJ7MD82toCAD4UTyKOIx3rggYgnptLFb5HQGHGyhFIhhsOcg/479Q8jnIj+tmVpX3bIbu9UYfvf4zrtPxydmxMiWQDheqBOk1wRmKWh4AByjkY7PJq+CZPUxGQQk7AEdujL9iChb1jxAbc8g= 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:48 +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 05/27] qtnfmac: pass all AP settings to wireless card for processing Date: Thu, 24 Aug 2017 19:30:02 -0700 Message-Id: <20170825023024.10565-6-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: 9771ce7b-deeb-464b-6070-08d4eb614c41 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:/JYPFbzPf5Y+hstWuXcrfK7mSGFMzkXW53HqS0m0HNo/ry61GPWXX46Peqz7w152XpoM4UJg5boD0tl4QsEguOVQVditbKyNyRvfQiGv4F84kiC+bbmPzeGWy5dJlwlXI41XYvs0uqLjQsImaW67DZPqHjbDPcr5znt1pYydOQZAnjTOc28TV1fCKLXfnFK6OxzKJ/f2rnWm8p1y7+5AeyZ+rhLyYWRLr0oTgWRSNbfFg+2emdYFlYiBxoCrKNQW; 25:SFg5zxKTVxVt+ARwnt0A8d5RF0dnll8S7DuIo7aHs1nikpyb77FlWKUAe48mFgvsRbgdqtQAyUjm2qqgN3w+97UeII7pw96m7hs6xGL75HNYnPZvBE8PwPMoXvxS0o70mlA42lYbpR2Ys26WHmdMZPvip4eq+KccLrffFX3rRjlk1bvjyaOX5gUX9UJRMYQW1y0rbdPpis7us6QPGqufYUvFOe+zwB8BJawhhOn5NeiSTQELpGD+48R/av3iYlpdpqP4TfTubNbxbw2SidA6Rotrr/6sEKUpyL3XNvmX01gaBmZFZ56GGWvZMawN1V5IrTS2ZuQ+2sXgzqiFK7IWww==; 31:q0Z8lfcn+WGueRWiAlYnLOqk0ijgKkdoQKZ1ZO0r9DWkEFlE1T4JhA24Z8vXyPFoedfXhh7cVGf4qSxMu3CkCJ1eGw3c0upmgOFNNIOrgCWyZBoQdNQ5ntbTm6pWzRn9PpMoyqBPb/V7/3CRIkynqyCeL1qVTdkt9cIO+lOi2/rX+diKlR2X4Z0qbp8fgZHO4snlN3I/kYmJ7vBmfpAEBcvYAOEZQ8FHaIIh0lMbDyE= X-MS-TrafficTypeDiagnostic: SN1PR0501MB2047: X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 20:ZqWsvjmPep0yGkz5r0cauIZePZNb9jwYGDFJ8DsykiyV+IHXigo5MFr5DEIBLOScouKJEcyhaVAqKIaGaWd+DMG8T1YWnIfK/89QsG8zE2dR7xvMtuxQjNsQA9RhljLYH5R53uj5AqzPwwrt3AE8cJtddz2cqkWLXWn/I44eRiIZQvVG8RHlujqZdXhxh3tyAf8gdZpCs6LEReREx1DloWrn1+fNEsY+85J0Ij8vsLkmNnW3HdveiPIKUAmHt74uNLnpzFD4EGOQVBbVHuyyEnit1Dj9AdWRgPzUvCNV6u5PSZBzW4xZmVmzRJVM+y+xWFUvXqWz6FT/WeWguTehzda6BDqRweBPxici7JmRvIz6dDxV+hBe8gMxzro2iyZJQY6DIFpd/1JJHcdNo+7B8BZ/mkDBjJrKjna3ObExfHwLCNK3soXhqxhEMxuApk/jMaLO/83zHBZNbve4DzzlB6Ttg6mNZuH4hk2jUzAuCn8OXqYGD8HkrRHTpy94quMRhKYg7ihLTOZTjNZrGD7EcmzTmmdV2Y7e6v5mJS7jzAnkTCCFxRqH98MmyIOnMG7Bf0R/1F0G/amSKY/C3i1RmlljPOThHacxId19DQI6G8Y=; 4:9qQAN84xkWVnAtXIGh/IDuwe1442E/VGIOQqnB2baky0McLt9zlU1QrtyC2gJJPTeUZqJv57L2Qge0yuV0LXk2EK4yvGt51JGADIVRATJIHzU/pPkaFzerm1vXpoiUYtQUw/FTC8gKZjAFIDhAatoUQ1FbC1qC5V4Qtm3WvF0g/dCfhNQx6LVR2FZ+M/ip09P6v1iPJcEVHX8gRwG07nUYRPHwM9fqjvYj+MHEEyb012c6ZIB1SK2j5FMEJC2cSM 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)(20264003)(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:sICTGDpjphcAAwXe6+HNyM3X381+nsCSKl3pONQ?= =?us-ascii?Q?k9OzqaSOL/uz3eYAf9iRLkZEGv5ZWy0MsJHaK6/tJo/CU/+6HCU9cHNPb1de?= =?us-ascii?Q?DteUtH+z5uhi1ZaMdPgSqOfnJmkYPmoZ6sT49ora8feCT7Da6pmcoPor43Xf?= =?us-ascii?Q?u9XO6AKYaAG15RbLoGhfUJ8g3ZlIZD/2qXujTyOZGNcoB7LerHemQ0uRFRk/?= =?us-ascii?Q?0oJrFn5qO24KhPBNZP93OGV3KSQj2cvdQMWygFddVLW+6dadYHX4flj6+I5E?= =?us-ascii?Q?6evz2WpcyPteuXpTsOFlbbT8qM2LqpUM396dqkRcrWxyn6Y+Yx67dGgoiRaL?= =?us-ascii?Q?WNUhIC1LOH4ZTl3gzMuQoFgl6VVulTRJdsVrrtP1nBYaeAzYEyqLIgwKH24O?= =?us-ascii?Q?P8Ns/HR68VKx73iw0GzNqIyvKNdmmpoeHjuRzcjudQFF+1JeAOMYwJvxH5qn?= =?us-ascii?Q?LRpV86IKHgqbN6UjzT1E3ey1QZlTmZ3jPrBlxpKx2QkHNmnbP/66blyS2VLD?= =?us-ascii?Q?LgHbK6w7hcp33hkOLx4exxanLLfJ8sXh3epptijmG/CajXai+gQ8Yil6CizK?= =?us-ascii?Q?N0VdrdnSqQjB7vpjkaCkRHaxwXCJyE+tkB4IivUJCW+VJY8IU5A9+ZPxkSxW?= =?us-ascii?Q?vp2L9Uoo41FdCKcMHa4jl7tZkRUrEeOV0fL0rOmkRQhdty7UQ/w0JG8K/PYA?= =?us-ascii?Q?pnzXoZlkBPDIjM+ICLag8Mx/NIF1NKv/jlmMbcxDfA+CtRTmU+8uSLdwnhrg?= =?us-ascii?Q?IuGX0ubT3MGjueVW9F1SJbZfOP6LA9OIhBbUqOhQ77xlQa6POLknVzV3SN1r?= =?us-ascii?Q?Mrgt8FVdMs2SX8NIllRs2mOvcclzeGdp0NOWnumly59nvayOUFQnSIav6PiP?= =?us-ascii?Q?LxNYaB7as49L+a3DTpkFd9OhlNtmt0drnFnBGVQNntRr3lp+hxe1vC0tX6GC?= =?us-ascii?Q?VPmvha20b9Fqt5vVwHAhz4WOXjDCQ0QLO4A+gEghUdYUhyKUllPvDcqovMKs?= =?us-ascii?Q?MSzSA3Vn2OV9oc/PCuTQD3WISgPcJasochtgejxVIkY2BgP2wl2ljbJE2yHz?= =?us-ascii?Q?hMggUHgr/e7r6WodnCazJGUWKFnULcoYv9GVKPrT1inuL4UHfw9LW2jDH2ZI?= =?us-ascii?Q?3OG4LgZrjvU0fMrhQfs9by2/V1U6l8VncvzvuLKswCYjoltWJt57/H29orel?= =?us-ascii?Q?NvdeZLEnwLwVIBc5ZmUYlunMw9OkNw6r1TFTp2Ak5DPDhZPqOEHGwpnXdV/4?= =?us-ascii?Q?xCALkwGXEmJKnztHudqzVn4N3i8lq3+sYzucPBpR1doN9p/TtA66xJz4w5QT?= =?us-ascii?Q?xi3IVFcUfxCm/xn5Mpib/gA4=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 6:3biqJJ/OsPjezDmlHbyoECuovSp084YjyIdBmrKF1cm97oeZfdbkB2E3N2w/LfT5cprvzM4xSmfprRuGG9SkTSrfDDYo70aHYTTDQgn0RlYJElXDu6OADA7bhGEyWX1IjkHZoC9pNkj2oVZtqofr0OwdMeu3XKApVdiay/pX7krNmx2mzTgvr8/MAAXEuLvQZbVRjB7FL+IsVrFNLNwYgfJ7CGW9DoxFTUWBvjGEdGkfJiyx/obkvZ+h5lCbVKCcBSBUUy95mFsJi62M5eY6uPkiaNn7QlnNnpxwKpS/kP7GjrQJhyIDiYESX7cqnJQ2YRz9UILNyptcWHTnVjk1sg==; 5:Gdo0iBD5NF3LyqEhuUL5L+z/BVaCFibfZuon3gwRoel8CyD8QNVnPbDSQP9FjS9b4GI/D1AZcOrcDOexO9z8upcR60eG5zDuK6iW3PFpiiHrnFprqzAL8SlUbPBxmGreNBgk+NYfoeWkmG3b68XIEw==; 24:OcOoB9UYn2TGgRKDA6KrrAXbf7eP5A0lkUbs+Aonx816llhiGcc6eN9YuHR/Yrp0RTcCV6f5VoNrTJ7EQh2OmduSsNAyG9HFB6Tt0w86nlY=; 7:ifzLyukLuAsEFMAc2uuMMRYGnntC+8hJ5sYVj+o4yLXIEiUotDyf7VeblPZrUS+VmLgs2jnV5y9zMwiqQ4OjIw6Y+H8e7QdolPP2MqteFzPzwNwl84Eh1dIo3g65tBA3DhP7/M8qAhAX3rRYu5L3amAZfyJARNrenQDZlmcKNkyFFlGJZYTacfbAWUoENu+868FJGL/XMlNrpeSYsueYQ1Qd7vVVkdNUC3kQMkLxcu8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2017 02:30:48.4009 (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 "struct cfg80211_ap_settings" provides more information for AP mode configuration that is currently being passed on to network card for processing. Modify QLINK command to pass all AP settings. Make most of settings a constant part of "config AP" command instead of passing it as optional TLVs. Signed-off-by: Igor Mitsyanko --- drivers/net/wireless/quantenna/qtnfmac/commands.c | 52 ++++++++------- drivers/net/wireless/quantenna/qtnfmac/qlink.h | 78 ++++++++++++++++------ .../net/wireless/quantenna/qtnfmac/qlink_util.c | 13 ++++ .../net/wireless/quantenna/qtnfmac/qlink_util.h | 1 + 4 files changed, 101 insertions(+), 43 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c index b498019..cddbb5d 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.c +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c @@ -187,27 +187,34 @@ int qtnf_cmd_send_config_ap(struct qtnf_vif *vif, struct sk_buff *cmd_skb; struct cfg80211_chan_def *chandef = &vif->mac->chandef; struct qlink_tlv_channel *qchan; - struct qlink_auth_encr aen; + struct qlink_cmd_config_ap *cmd; + struct qlink_auth_encr *aen; u16 res_code = QLINK_CMD_RESULT_OK; int ret; int i; cmd_skb = qtnf_cmd_alloc_new_cmdskb(vif->mac->macid, vif->vifid, QLINK_CMD_CONFIG_AP, - sizeof(struct qlink_cmd)); + sizeof(*cmd)); if (unlikely(!cmd_skb)) return -ENOMEM; - qtnf_bus_lock(vif->mac->bus); + cmd = (struct qlink_cmd_config_ap *)cmd_skb->data; + cmd->dtim_period = s->dtim_period; + cmd->beacon_interval = cpu_to_le16(s->beacon_interval); + cmd->hidden_ssid = qlink_hidden_ssid_nl2q(s->hidden_ssid); + cmd->inactivity_timeout = cpu_to_le16(s->inactivity_timeout); + cmd->smps_mode = s->smps_mode; + cmd->p2p_ctwindow = s->p2p_ctwindow; + cmd->p2p_opp_ps = s->p2p_opp_ps; + cmd->pbss = s->pbss; + 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); - qtnf_cmd_skb_put_tlv_u16(cmd_skb, QTN_TLV_ID_BCN_PERIOD, - s->beacon_interval); - qtnf_cmd_skb_put_tlv_u8(cmd_skb, QTN_TLV_ID_DTIM, s->dtim_period); - 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) - @@ -215,26 +222,25 @@ int qtnf_cmd_send_config_ap(struct qtnf_vif *vif, qchan->hw_value = cpu_to_le16( ieee80211_frequency_to_channel(chandef->chan->center_freq)); - memset(&aen, 0, sizeof(aen)); - aen.auth_type = s->auth_type; - aen.privacy = !!s->privacy; - aen.mfp = 0; - aen.wpa_versions = cpu_to_le32(s->crypto.wpa_versions); - aen.cipher_group = cpu_to_le32(s->crypto.cipher_group); - aen.n_ciphers_pairwise = cpu_to_le32(s->crypto.n_ciphers_pairwise); + aen = &cmd->aen; + aen->auth_type = s->auth_type; + aen->privacy = !!s->privacy; + aen->mfp = 0; + aen->wpa_versions = cpu_to_le32(s->crypto.wpa_versions); + aen->cipher_group = cpu_to_le32(s->crypto.cipher_group); + aen->n_ciphers_pairwise = cpu_to_le32(s->crypto.n_ciphers_pairwise); for (i = 0; i < QLINK_MAX_NR_CIPHER_SUITES; i++) - aen.ciphers_pairwise[i] = - cpu_to_le32(s->crypto.ciphers_pairwise[i]); - aen.n_akm_suites = cpu_to_le32(s->crypto.n_akm_suites); + aen->ciphers_pairwise[i] = + cpu_to_le32(s->crypto.ciphers_pairwise[i]); + aen->n_akm_suites = cpu_to_le32(s->crypto.n_akm_suites); for (i = 0; i < QLINK_MAX_NR_AKM_SUITES; i++) - aen.akm_suites[i] = cpu_to_le32(s->crypto.akm_suites[i]); - aen.control_port = s->crypto.control_port; - aen.control_port_no_encrypt =s->crypto.control_port_no_encrypt; - aen.control_port_ethertype = + aen->akm_suites[i] = cpu_to_le32(s->crypto.akm_suites[i]); + aen->control_port = s->crypto.control_port; + aen->control_port_no_encrypt = s->crypto.control_port_no_encrypt; + aen->control_port_ethertype = cpu_to_le16(be16_to_cpu(s->crypto.control_port_ethertype)); - qtnf_cmd_skb_put_tlv_arr(cmd_skb, QTN_TLV_ID_CRYPTO, (u8 *)&aen, - sizeof(aen)); + 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 fb88f3e..6814254 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/qlink.h +++ b/drivers/net/wireless/quantenna/qtnfmac/qlink.h @@ -132,6 +132,24 @@ struct qlink_chandef { u8 rsvd[3]; } __packed; +#define QLINK_MAX_NR_CIPHER_SUITES 5 +#define QLINK_MAX_NR_AKM_SUITES 2 + +struct qlink_auth_encr { + __le32 wpa_versions; + __le32 cipher_group; + __le32 n_ciphers_pairwise; + __le32 ciphers_pairwise[QLINK_MAX_NR_CIPHER_SUITES]; + __le32 n_akm_suites; + __le32 akm_suites[QLINK_MAX_NR_AKM_SUITES]; + __le16 control_port_ethertype; + u8 auth_type; + u8 privacy; + u8 mfp; + u8 control_port; + u8 control_port_no_encrypt; +} __packed; + /* QLINK Command messages related definitions */ @@ -521,6 +539,46 @@ struct qlink_cmd_chan_switch { u8 beacon_count; } __packed; +/** + * enum qlink_hidden_ssid - values for %NL80211_ATTR_HIDDEN_SSID + * + * Refer to &enum nl80211_hidden_ssid + */ +enum qlink_hidden_ssid { + QLINK_HIDDEN_SSID_NOT_IN_USE, + QLINK_HIDDEN_SSID_ZERO_LEN, + QLINK_HIDDEN_SSID_ZERO_CONTENTS +}; + +/** + * struct qlink_cmd_config_ap - data for QLINK_CMD_CONFIG_AP command + * + * @beacon_interval: beacon interval + * @inactivity_timeout: station's inactivity period in seconds + * @dtim_period: DTIM period + * @hidden_ssid: whether to hide the SSID, one of &enum qlink_hidden_ssid + * @smps_mode: SMPS mode + * @ht_required: stations must support HT + * @vht_required: stations must support VHT + * @aen: encryption info + * @info: variable configurations + */ +struct qlink_cmd_config_ap { + struct qlink_cmd chdr; + __le16 beacon_interval; + __le16 inactivity_timeout; + u8 dtim_period; + u8 hidden_ssid; + u8 smps_mode; + u8 p2p_ctwindow; + u8 p2p_opp_ps; + u8 pbss; + u8 ht_required; + u8 vht_required; + struct qlink_auth_encr aen; + u8 info[0]; +} __packed; + /* QLINK Command Responses messages related definitions */ @@ -881,8 +939,6 @@ enum qlink_tlv_id { QTN_TLV_ID_RTS_THRESH = 0x0202, QTN_TLV_ID_SRETRY_LIMIT = 0x0203, QTN_TLV_ID_LRETRY_LIMIT = 0x0204, - QTN_TLV_ID_BCN_PERIOD = 0x0205, - QTN_TLV_ID_DTIM = 0x0206, QTN_TLV_ID_REG_RULE = 0x0207, QTN_TLV_ID_CHANNEL = 0x020F, QTN_TLV_ID_COVERAGE_CLASS = 0x0213, @@ -1072,24 +1128,6 @@ struct qlink_tlv_channel { u8 rsvd[2]; } __packed; -#define QLINK_MAX_NR_CIPHER_SUITES 5 -#define QLINK_MAX_NR_AKM_SUITES 2 - -struct qlink_auth_encr { - __le32 wpa_versions; - __le32 cipher_group; - __le32 n_ciphers_pairwise; - __le32 ciphers_pairwise[QLINK_MAX_NR_CIPHER_SUITES]; - __le32 n_akm_suites; - __le32 akm_suites[QLINK_MAX_NR_AKM_SUITES]; - __le16 control_port_ethertype; - u8 auth_type; - u8 privacy; - u8 mfp; - u8 control_port; - u8 control_port_no_encrypt; -} __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 3c1db5b..63a74b2 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c +++ b/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c @@ -127,3 +127,16 @@ void qlink_chandef_q2cfg(struct wiphy *wiphy, break; } } + +enum qlink_hidden_ssid qlink_hidden_ssid_nl2q(enum nl80211_hidden_ssid nl_val) +{ + switch (nl_val) { + case NL80211_HIDDEN_SSID_ZERO_LEN: + return QLINK_HIDDEN_SSID_ZERO_LEN; + case NL80211_HIDDEN_SSID_ZERO_CONTENTS: + return QLINK_HIDDEN_SSID_ZERO_CONTENTS; + case NL80211_HIDDEN_SSID_NOT_IN_USE: + default: + return QLINK_HIDDEN_SSID_NOT_IN_USE; + } +} diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink_util.h b/drivers/net/wireless/quantenna/qtnfmac/qlink_util.h index 5e49a8a..416f11d 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/qlink_util.h +++ b/drivers/net/wireless/quantenna/qtnfmac/qlink_util.h @@ -66,5 +66,6 @@ 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); +enum qlink_hidden_ssid qlink_hidden_ssid_nl2q(enum nl80211_hidden_ssid nl_val); #endif /* _QTN_FMAC_QLINK_UTIL_H_ */