From patchwork Fri Aug 25 02:30:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mitsyanko X-Patchwork-Id: 9921187 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 B21E1600C5 for ; Fri, 25 Aug 2017 02:31:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9AACB204BA for ; Fri, 25 Aug 2017 02:31:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8EB852026B; Fri, 25 Aug 2017 02:31:29 +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 D28BB205F6 for ; Fri, 25 Aug 2017 02:31:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754503AbdHYCbH (ORCPT ); Thu, 24 Aug 2017 22:31:07 -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 S1754421AbdHYCay (ORCPT ); Thu, 24 Aug 2017 22:30:54 -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=+MhsOFAg7S9FNXKDeSbpbFun3D9kM+/EJCNekBkbQ8g=; b=NQ7m+X9XvaK264dYVNSAPqMdTJaB1NXWYtNwdyS/RRqAOgPn/VqObCYFUU8vvPo//mzZudHeHrdv57lbLOFW7noDkZneOpLHb3QHAUZHLHa+hCQns5mwuHC4rRwc+HYMqay9erzDKl8ia0vuutyplHzY1Ysid3Am0EP6isGh4bw= 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:52 +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 09/27] qtnfmac: do not cache BSS state in per-VIF structure Date: Thu, 24 Aug 2017 19:30:06 -0700 Message-Id: <20170825023024.10565-10-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: 6e1f6cf2-b3b0-4ecb-36e8-08d4eb614e9a 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:DrqtNFQj8W8RhRZu4NI03o+VFxwO/5UzYsipiUVneW4U3GzATFLYiEUBeambGLMjLTV3Rrmt69Riocubx8N4dCHtanYhoaZc24yQXq2yy5bUhbevHlqy6TKd7jYIG1/OWOTDhT4xBkda12S+mYDOmNdZOD4jNOH/MlsLcsms/71Tqo8ebwVbgSjPSdz9jl4BMMfFn4ikuN+JJXn4BN4fbMxfZQxsItosChqkd+Wgl6WR2GSBJdIqQ1F1qwRUMyQh; 25:JlUktOvAkY8FArUB+PUYQodwLj/NyBFzG9ZAd8vWgLwq0Ihwd6QJYaQ2g1jnU5or0YXanXSE3AZyU4bJmt6EwR+qCR38AmBWMkjXGNGCjrC632Yi2uOcw8U/JE612PX44tQKJKHZmiZm8i+Y3/9Ek1hVuar0DhtcI73rIFDtsTCvVvYrhetVYtH98RdYUTkEU+zsTDEYFDf5pa9qKYpZYpnuBGqV/M4Mg8etjXaIyBzqotI01lKNBZ5+3cN1eQEnGeYGKQQjoHVqplDTT+nv70PA4P+LHDewUiB8lqvAHl/pRHFehjZ16CCu9SjTCPmeUOTKoxLGbymq59lR+MwozA==; 31:UOGANEkhPkf0nyasAITXgjkJUSsdhLmudhhpv0t5A7Zqv5+/xCCMcmGC3Pey4gXr6MpYdUZ0A/DegI7VdAvAfEGwpSHG+R4g12g4bkUKzIBe+hc2qZVXAEeyMoR80hJYvCcki91Iy8oLuJdzd0mmp/k3KzFUCtJeoc7wEXlcm3dvGehd/DNlSD31H4reRR3OlYyT9INcE1RGR+pK2Jc+i0naXUdjhPexh9ZrSW7eZ/8= X-MS-TrafficTypeDiagnostic: SN1PR0501MB2047: X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 20:/JqBDiCRcrYyNc3IGnzPghVezrBJl9sc6468V4PwuZnER/L/hSmhn8spJ36VPbXwQbY4REkScGlNN+u4Jvr79DGV2AeWiG69+/G9Vy/Mpxr5YUTjUbrE4gCZEt4uI2hSKhtXNXhYPfmnOLoh9Qut49Yle2Wz6BEH11LR8K9XzP20O+Mf/a+uSe80SGDWxrsVRfnrkQGiMjV2w9PDu0gcPsyd65sYj61+MHD7it/znO2IzEwhRT0+HCMG2GoJuv04JeYD9sFDd/0gbcC5ebnSYdaHyRwvERYl4bEg0hilB8mmsZVu9FnBbAdpQ8RU6+4ziGNSJy+iNmRbtW2LT1Jz+HZsV7AFBQi8iw8g+ktz5woe2phj88VM4EgaPrO8odnPTFtjlqzVVL3yFeMIO5wcD3hEb0TPVffcy2XzrfHhaVHxDbDWeV+v6m89raoDY1nE2/QCAgZGxjah4BAqTprWiT9qN7/ob3AQsKLIW0uKdRZaZYZgvV//R0Abv8BzH3gpvt+xuyfRQeklyOOLviorc/nnFGQHpsmlMVMikrFo5Tn5KOwv4PGLdjjo+MZ0VqM5BlWwB82xtiCstpiur4Urq3x35lZADbtqH+BN7MXCxx0=; 4:ymvRC+HmRMpjKFEPj/w1LxUvvnxIGYO9s4g1Qyy3Z0c6S6Rqx4mtf+wmXtCW7GtFN9bgi/LS3pxNRPzsJz/Ee7MAtY5mZ9+yVKzdHlV6ahmUWndZgaKs+hzUSOTUN5K0WnJSk2ggNMI9RrAN00/uAZry5FU0n07D5GCiCNHdeScIzvBEemHBjSWQ1KFrltEqRaCAOW3LLuDCu1H8vSjoEx/3DIFPtVSBNEYMTttKxhoCXriw1l2blqxyytzRMEuf4G7P0LweBYpXqBXThV0X232uw6ESUBdyywmppj4wMoA= X-Exchange-Antispam-Report-Test: UriScan:(21532816269658); 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)(575784001)(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:ubPCAgk+V4ppFmTZmA++kMnVFsjvAPJmPWFlmhl?= =?us-ascii?Q?JXI9Cc66kBc8XPB6CNe7k+fCgo/gcW5E8aVJnaZpq8SmWQQY4xQ4Ekidc3Lm?= =?us-ascii?Q?ovu6EAWmgLHGPUrKWN7CPgXf0r4a4PE0FLjG3fNdXrEsqu9v7OpCvnYwe9ES?= =?us-ascii?Q?6S+ODlOOC7OIYMtK+I9vJpFnJrTt4yWKCmDrgdjiFBvpi/NCwZaobw3HF1uv?= =?us-ascii?Q?LZApoNQEGbcBRLmlPfDQIn9cAmTCmTgcZ5JutlZQgswtGQ8GNI6dNgbCv+cW?= =?us-ascii?Q?TcDpd6lzBEQKt1iXDIG2YGquwERgvJak6hH8YCvlRvuBa0yTi3FBsUJsiXT1?= =?us-ascii?Q?qRsOUhWZqJulybbU1szGLpd44im2aYa4Kjex7bzY4GqdQRLygjMCaL1ZtmFJ?= =?us-ascii?Q?KZO4nU1PmIWCG7zl4kTXEPxtEmj15wvvqQnrvo2yqFOUbbATZwFTHXVa6P2L?= =?us-ascii?Q?OfTFWyJeUvJXDnMPnDSvnza9M1kWI/icJ8oPTshWHWqePAiHUWT1aiSI4w99?= =?us-ascii?Q?RKrB5CXLNRt0U3L2g4D/4RU5pQFcc5HE/9OD8+cwJyONIXLkhj/tJPXXKjXz?= =?us-ascii?Q?1km9U5zVnvGOPwLiWpYmY56T/qNyNJA+CVlL1a2BfGtk7qHLVWTbKcnyXEdO?= =?us-ascii?Q?v1GjSjimTsX513GlBgpCwEollMJQ1lQpbZ4eIIfA07qX5s/BCVRPnq5wsM//?= =?us-ascii?Q?6JupLuX6lOrqKU9ow6apsJrVwqjXYOANlfPiGjmHMsFm+xq02YPZKLswtyl3?= =?us-ascii?Q?eNp2XxXccUNSVR8yuhT8klFPV9m+7AWcwG0A4RorA/KoBrdSo0B9WG9fId2I?= =?us-ascii?Q?gr1HR3VdvP0AfJx9pvaWgqXPHGNeAf+6lju+NC+l50G6TwNlhuB4wINSp0XX?= =?us-ascii?Q?ffVgLNoiGOBX3kEB5tZHj4k+OEV46++Zq1cQ/DSY/YJi2gusX/IJZJTdLuqE?= =?us-ascii?Q?8mPSQ9aemEI6whZJxvBrxrUXP5rPRtFwuCdXaacLCa94zIxRBHXwsQZS+BY4?= =?us-ascii?Q?gHyUbFdTpiFvK3ORMcBKUl5Vfuwly2EuoQo+VLda4eOz/189yIGAQ1RVG/gI?= =?us-ascii?Q?mbOoq/Q+a/cFl9FoAZJZk9a6J1TFGmTt//nxF624ExC0um/Qqw+vb1pnlgzJ?= =?us-ascii?Q?8HQpKo0LjNx1pCjeqN3htd4ihQXpwaVTSOrWFHs04p517MV3zplcAJSlbezF?= =?us-ascii?Q?mrGfmYhCHUvXzQmPKVpd4OEURr9lcOXCIsNFnX0nEBq9kDSNd8D5vY0yUJkw?= =?us-ascii?Q?SLtRihoCr/icKbXDye9nKtU/QyTzRqRBO4GEB4HkAV2YywCfg26DURxQRdLd?= =?us-ascii?Q?cyAvjGEKiwYsvRzlMxN7oeMU=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 6:0EUn4YHI+6bcL4xPEDhTuuZNHv/wy/+t0860TE381OH2C84GE61Wl3C8AUs+3qq2f4H1vNTGCsA/XZfBGB5LaFAwRQQaXSnuXhByNKdT8i4uLrMQk90TLEHO3ly3s9IhI69/04ktRz86J0Diuols22VJyKa8QPW/7BJsYzDwd36CKuBOh+FP5R/AIO9FZJIJghXG+DW1lLgnal8gnfC/sDUoiN+7zBQIN9UWV6Z+n0PY7e133WlhWEhtQUv16A9kR/rV19YEXt/HN/udDoqMeyYnLxYKfrQV46zViCvVNpEKGcerSpM5O9/Dzy4G6IKr6CcCgxj7aNBYp6pBYIqEww==; 5:HErmF3BXcSvjJHqJoquLUf8419WgJO2+M5XyX/ig7uUpsaCCA+Z4KxEl8/H/n7bfBHGc0dbPNldVyDHeb7JP07TId8HcdRgt09Wb3FT1zzuU4hMO059TuCIJ/Dm/8fEUrzAHOSAwjr1i2s1ysOMwRg==; 24:/hIwP8GbJOJ3IFjhYvwy+ZK3NeAdu8YUBqRT8B1DjT2O7o3Xx0KCazdhki7TSFtvX2WtUjRs328y7+6D5AfHcn3JMlhyum3m01y8r77t1PY=; 7:uYRsbzomXtyqrUyT56AeA3KItc6Ryfgz/JS+s5Q2Awfaak9ZFPKoFUb6f1PLfxJvVrUqUrCBGTGplC5V2sevwAAaKbo8Hcj5JDyDJ3ArLgqkmN1uIF2I9n6hza0iQtEUpQsENMzcPCciw5a9huTV3IQLOFMdJOLJHJcbGtCsN/OcUXCUiYgRj5fY9ZoGwK027DqO998vl7r4kvXevTf+3vPqcVhDBdJSPrgWJTnsyDw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2017 02:30:52.3541 (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 This cached state is unused, except for BSSID that we will keep. Signed-off-by: Igor Mitsyanko --- drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 39 ++++-------------- drivers/net/wireless/quantenna/qtnfmac/commands.c | 49 +++++++++++++++-------- drivers/net/wireless/quantenna/qtnfmac/core.h | 19 ++------- 3 files changed, 42 insertions(+), 65 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c index 999f1bd..9eb0c08 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c @@ -131,6 +131,7 @@ int qtnf_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev) vif->netdev = NULL; vif->wdev.iftype = NL80211_IFTYPE_UNSPECIFIED; eth_zero_addr(vif->mac_addr); + eth_zero_addr(vif->bssid); return 0; } @@ -199,6 +200,8 @@ static struct wireless_dev *qtnf_add_virtual_intf(struct wiphy *wiphy, qtnf_cmd_send_del_intf(vif); err_cmd: vif->wdev.iftype = NL80211_IFTYPE_UNSPECIFIED; + eth_zero_addr(vif->mac_addr); + eth_zero_addr(vif->bssid); return ERR_PTR(-EFAULT); } @@ -569,7 +572,6 @@ qtnf_connect(struct wiphy *wiphy, struct net_device *dev, struct qtnf_vif *vif = qtnf_netdev_get_priv(dev); struct qtnf_wmac *mac = wiphy_priv(wiphy); struct cfg80211_chan_def chandef; - struct qtnf_bss_config *bss_cfg; int ret; if (vif->wdev.iftype != NL80211_IFTYPE_STATION) @@ -578,9 +580,6 @@ qtnf_connect(struct wiphy *wiphy, struct net_device *dev, if (vif->sta_state != QTNF_STA_DISCONNECTED) return -EBUSY; - bss_cfg = &vif->bss_cfg; - memset(bss_cfg, 0, sizeof(*bss_cfg)); - if (sme->channel) { /* FIXME: need to set proper nl80211_channel_type value */ cfg80211_chandef_create(&chandef, sme->channel, @@ -593,34 +592,10 @@ qtnf_connect(struct wiphy *wiphy, struct net_device *dev, memcpy(&mac->chandef, &chandef, sizeof(mac->chandef)); } - bss_cfg->ssid_len = sme->ssid_len; - memcpy(&bss_cfg->ssid, sme->ssid, bss_cfg->ssid_len); - bss_cfg->auth_type = sme->auth_type; - bss_cfg->privacy = sme->privacy; - bss_cfg->mfp = sme->mfp; - - if ((sme->bg_scan_period > 0) && - (sme->bg_scan_period <= QTNF_MAX_BG_SCAN_PERIOD)) - bss_cfg->bg_scan_period = sme->bg_scan_period; - else if (sme->bg_scan_period == -1) - bss_cfg->bg_scan_period = QTNF_DEFAULT_BG_SCAN_PERIOD; - else - bss_cfg->bg_scan_period = 0; /* disabled */ - - bss_cfg->connect_flags = 0; - - if (sme->flags & ASSOC_REQ_DISABLE_HT) - bss_cfg->connect_flags |= QLINK_STA_CONNECT_DISABLE_HT; - if (sme->flags & ASSOC_REQ_DISABLE_VHT) - bss_cfg->connect_flags |= QLINK_STA_CONNECT_DISABLE_VHT; - if (sme->flags & ASSOC_REQ_USE_RRM) - bss_cfg->connect_flags |= QLINK_STA_CONNECT_USE_RRM; - - memcpy(&bss_cfg->crypto, &sme->crypto, sizeof(bss_cfg->crypto)); if (sme->bssid) - ether_addr_copy(bss_cfg->bssid, sme->bssid); + ether_addr_copy(vif->bssid, sme->bssid); else - eth_zero_addr(bss_cfg->bssid); + eth_zero_addr(vif->bssid); ret = qtnf_cmd_send_connect(vif, sme); if (ret) { @@ -1050,7 +1025,7 @@ void qtnf_virtual_intf_cleanup(struct net_device *ndev) break; case QTNF_STA_CONNECTING: cfg80211_connect_result(vif->netdev, - vif->bss_cfg.bssid, NULL, 0, + vif->bssid, NULL, 0, NULL, 0, WLAN_STATUS_UNSPECIFIED_FAILURE, GFP_KERNEL); @@ -1077,7 +1052,7 @@ void qtnf_cfg80211_vif_reset(struct qtnf_vif *vif) switch (vif->sta_state) { case QTNF_STA_CONNECTING: cfg80211_connect_result(vif->netdev, - vif->bss_cfg.bssid, NULL, 0, + vif->bssid, NULL, 0, NULL, 0, WLAN_STATUS_UNSPECIFIED_FAILURE, GFP_KERNEL); diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c index cb9632b..7dbee42 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.c +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c @@ -2036,11 +2036,11 @@ int qtnf_cmd_send_connect(struct qtnf_vif *vif, { struct sk_buff *cmd_skb; struct qlink_cmd_connect *cmd; - struct qtnf_bss_config *bss_cfg = &vif->bss_cfg; struct qlink_auth_encr aen; u16 res_code = QLINK_CMD_RESULT_OK; int ret; int i; + u32 connect_flags = 0; cmd_skb = qtnf_cmd_alloc_new_cmdskb(vif->mac->macid, vif->vifid, QLINK_CMD_CONNECT, @@ -2052,40 +2052,55 @@ int qtnf_cmd_send_connect(struct qtnf_vif *vif, cmd = (struct qlink_cmd_connect *)cmd_skb->data; - ether_addr_copy(cmd->bssid, bss_cfg->bssid); + ether_addr_copy(cmd->bssid, vif->bssid); if (vif->mac->chandef.chan) cmd->channel = cpu_to_le16(vif->mac->chandef.chan->hw_value); - cmd->bg_scan_period = cpu_to_le16(bss_cfg->bg_scan_period); + if ((sme->bg_scan_period > 0) && + (sme->bg_scan_period <= QTNF_MAX_BG_SCAN_PERIOD)) + cmd->bg_scan_period = cpu_to_le16(sme->bg_scan_period); + else if (sme->bg_scan_period == -1) + cmd->bg_scan_period = cpu_to_le16(QTNF_DEFAULT_BG_SCAN_PERIOD); + else + cmd->bg_scan_period = 0; /* disabled */ + + if (sme->flags & ASSOC_REQ_DISABLE_HT) + connect_flags |= QLINK_STA_CONNECT_DISABLE_HT; + if (sme->flags & ASSOC_REQ_DISABLE_VHT) + connect_flags |= QLINK_STA_CONNECT_DISABLE_VHT; + if (sme->flags & ASSOC_REQ_USE_RRM) + connect_flags |= QLINK_STA_CONNECT_USE_RRM; + + cmd->flags = cpu_to_le32(connect_flags); memset(&aen, 0, sizeof(aen)); - aen.auth_type = bss_cfg->auth_type; - aen.privacy = !!bss_cfg->privacy; - aen.mfp = bss_cfg->mfp; - aen.wpa_versions = cpu_to_le32(bss_cfg->crypto.wpa_versions); - aen.cipher_group = cpu_to_le32(bss_cfg->crypto.cipher_group); + aen.auth_type = sme->auth_type; + aen.privacy = !!sme->privacy; + aen.mfp = sme->mfp; + aen.wpa_versions = cpu_to_le32(sme->crypto.wpa_versions); + aen.cipher_group = cpu_to_le32(sme->crypto.cipher_group); aen.n_ciphers_pairwise = cpu_to_le32( - bss_cfg->crypto.n_ciphers_pairwise); + sme->crypto.n_ciphers_pairwise); for (i = 0; i < QLINK_MAX_NR_CIPHER_SUITES; i++) aen.ciphers_pairwise[i] = cpu_to_le32( - bss_cfg->crypto.ciphers_pairwise[i]); + sme->crypto.ciphers_pairwise[i]); - aen.n_akm_suites = cpu_to_le32(bss_cfg->crypto.n_akm_suites); + aen.n_akm_suites = cpu_to_le32(sme->crypto.n_akm_suites); for (i = 0; i < QLINK_MAX_NR_AKM_SUITES; i++) aen.akm_suites[i] = cpu_to_le32( - bss_cfg->crypto.akm_suites[i]); + sme->crypto.akm_suites[i]); - aen.control_port = bss_cfg->crypto.control_port; + aen.control_port = sme->crypto.control_port; aen.control_port_no_encrypt = - bss_cfg->crypto.control_port_no_encrypt; + sme->crypto.control_port_no_encrypt; aen.control_port_ethertype = cpu_to_le16(be16_to_cpu( - bss_cfg->crypto.control_port_ethertype)); + sme->crypto.control_port_ethertype)); - qtnf_cmd_skb_put_tlv_arr(cmd_skb, WLAN_EID_SSID, bss_cfg->ssid, - bss_cfg->ssid_len); + qtnf_cmd_skb_put_tlv_arr(cmd_skb, WLAN_EID_SSID, sme->ssid, + sme->ssid_len); qtnf_cmd_skb_put_tlv_arr(cmd_skb, QTN_TLV_ID_CRYPTO, (u8 *)&aen, sizeof(aen)); diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.h b/drivers/net/wireless/quantenna/qtnfmac/core.h index a40295e..aa1a92f 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/core.h +++ b/drivers/net/wireless/quantenna/qtnfmac/core.h @@ -57,20 +57,6 @@ extern const struct net_device_ops qtnf_netdev_ops; struct qtnf_bus; struct qtnf_vif; -struct qtnf_bss_config { - u8 ssid[IEEE80211_MAX_SSID_LEN]; - u8 bssid[ETH_ALEN]; - size_t ssid_len; - u8 dtim; - u16 bcn_period; - u16 auth_type; - bool privacy; - enum nl80211_mfp mfp; - struct cfg80211_crypto_settings crypto; - u16 bg_scan_period; - u32 connect_flags; -}; - struct qtnf_sta_node { struct list_head list; u8 mac_addr[ETH_ALEN]; @@ -93,6 +79,8 @@ enum qtnf_mac_status { struct qtnf_vif { struct wireless_dev wdev; + u8 bssid[ETH_ALEN]; + u8 mac_addr[ETH_ALEN]; u8 vifid; u8 bss_priority; u8 bss_status; @@ -100,9 +88,8 @@ struct qtnf_vif { u16 mgmt_frames_bitmask; struct net_device *netdev; struct qtnf_wmac *mac; - u8 mac_addr[ETH_ALEN]; + struct work_struct reset_work; - struct qtnf_bss_config bss_cfg; struct qtnf_sta_list sta_list; unsigned long cons_tx_timeout_cnt; };