From patchwork Thu Sep 21 21:34:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mitsyanko X-Patchwork-Id: 9964843 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 2C94C6056E for ; Thu, 21 Sep 2017 21:35:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1EE7B28DD3 for ; Thu, 21 Sep 2017 21:35:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 13D3429680; Thu, 21 Sep 2017 21:35:15 +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 A81892967E for ; Thu, 21 Sep 2017 21:35:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751871AbdIUVfO (ORCPT ); Thu, 21 Sep 2017 17:35:14 -0400 Received: from mail-bn3nam01on0045.outbound.protection.outlook.com ([104.47.33.45]:56553 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751846AbdIUVfC (ORCPT ); Thu, 21 Sep 2017 17:35:02 -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=vv1OpSMd7PSC12/YtLKNgCUgiDbkM/ymCjrX8ModlYw=; b=rVWCzyLVU5AoHJnQCpQW0926YgCZr/UMM0LiifPCluBH3xensCLLLjDSUPxmHfX3fZE4t4QnjRJiyja/WTXd8qIPpH9F8us8u0grFMvyxubK/fRUduiQT527XgP3dEQ0yndDE7nkOcZaASNmJSJjUEyOBbgY0VwNBNxJjpIt9nA= Received: from dodo-dell.quantenna.com (12.131.200.68) by BLUPR0501MB2035.namprd05.prod.outlook.com (10.164.23.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.5; Thu, 21 Sep 2017 21:35:00 +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 Subject: [PATCH V3 4/9] qtnfmac: do not cache channel info from "connect" command Date: Thu, 21 Sep 2017 14:34:32 -0700 Message-Id: <20170921213437.27457-5-igor.mitsyanko.os@quantenna.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170921213437.27457-1-igor.mitsyanko.os@quantenna.com> References: <20170921213437.27457-1-igor.mitsyanko.os@quantenna.com> MIME-Version: 1.0 X-Originating-IP: [12.131.200.68] X-ClientProxiedBy: MWHPR13CA0006.namprd13.prod.outlook.com (10.169.208.16) To BLUPR0501MB2035.namprd05.prod.outlook.com (10.164.23.17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 580597a1-0222-4edd-fea1-08d501389d61 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BLUPR0501MB2035; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2035; 3:TrAFCL3KmYecF/O3JRz/XzMvztj5eTFQB3mIuBXi9ynbYducJKzAppsTr4UZuP+1uhDWNDHPpvn0kVqUOKkTGMZCTX/eN0qf5yBgCuMzbm3UZNZmb0iJZtspnWWoY1Z8sVjXXc+UivMIrUy7vXaZXkMS7RVmo9em7mby9wZW0XYzL+Hh5ZXmrf+yRxaQ981WfTS+aMSx3aAW5MniCCJsJ3UnBTspcupNfY8bm9L6iTs7sesp0dU17p2nv5z2PTKk; 25:s2ZoaMHVqZmQFc1b3htCMuiC4KFO9om/yyMXKeYZ8XSaIyHGKOb+nLdiqmLqH3Qi6Ra6E0rCCHg1Je1h8e8/1Vep9l0rYldGVakDfNe3jepwwuAQ/AkVsNQd71BjXmPrNM7flXdbgxnTQbdkOJatdKoZeQ8dE224TCMTqpWTaSS9sYJ2WK4WBRPsm6J49wy+1QXB7ZHlRWLRSxmEl0afu8NkolYiRGqaHs3wXVGMktKU+iMzJ6Swd+smo3bWyqYXCSL2xQjTLKS61bcvYe56H8J3ymXCQJG4zBwke9R2Hnvd8OdtOk7BA46oSpjN86e8Zxu0Bwhjo0YJOT0jcWsXjQ==; 31:2Pgl/P8qP9FlTEBHGLLGqQ3aRxc+m88donKCKw9wePY3wbFixKomf0AXun20lB2HFtyVImShavhDeXYDUhmx7J/la9Xw4M9Kk00hZWlIYvbecRrrcvD4X4jvN4lZphEP6WDj0ZUnLS1hqjoKHaQnhrfmQpeR/QyQOW7PfhhHaZHt6T9eYlHP+eWOd71mMZKC7vC+J+NekqZ13my29ttY5Q/DtKqyze0Qh7YMghb9+s0= X-MS-TrafficTypeDiagnostic: BLUPR0501MB2035: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=igor.mitsyanko.os@quantenna.com; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2035; 20:+9EQLJG7fDK1PO9kmKbZTToAWZodBFdVhnjZ23tIGCM/YdugDYv6Yvq2aKaMQjdjXYCDq9onx3+MNU/HM7dVFleDJWVYeo7uMhm8KSKpbWH3yZ0OHG5VBE56UWVQTL01Oct7xO9K6Bb8t9LjCFvSngqy91UiRrACqL8m5QfSQkkxCdcUvCq+N3x8A60H4+VuVu5m5tiynXYjXMC076Shezv7I8tgr+dAHBCj5etMqoojAsdFxsbJCLSptP3KnMGTh80yLOpcln06MsrC9gAGhtTbe9JDkWTKwseuyl+JdN+BJ76z9H8TZ7mVdC7sD+ZN6JyAXrn0RjncrKw9B4pXrfP2P2CTx0E+BKk+Gw0OorM/BKIiCzlY8M1G1JAIS9bLz5YXc6xaGwexCniCeEFDY1+DYuSf6DS6pjYPQDm0pC/xx4bIt0zzmv9NxzvPQVn9KQYR7YzPQ8KBcVI53yu51Q8SZsPwIDNgj64+Snm+znvEHVUskTW9PK1uX29rUYnqrYAZbHCOjTxPMXYdZ86bxpcHPSOJ6V4fbFCaF1RB4GT5ZECKHgtkL2KSw7pz0fu4l1D7/Sxpuxk2oeaurpdMR1wJrUjhs6PhFa7kzOq7uMI=; 4:jNMO4V0m8giuB5ctc6K1zXOis4ykR34/EZFoEifgEsBviZplmgp6t6lRz7nhJVwOnOMSmwxXe5j4gaOSzDbZpovGN83ssE9p9lI6dcRUrs8qLAoAq38AaX2knu8B1i4M6Yu5YH2/O7WFd7lOac788TCsjeXbETa5vJsssEc3lCA/2d+0gDRQIxHrZRHSNvpvCP+GH5RwGlTzSmWhHkA1TA31/tICBgAxglOjViRHAfcP5Sux5OXfrnYfuqODjM6wsymkilslgJYs0tQmiA7z3QxLWwC/yLfJY8UM/pN5Thk= 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)(2401047)(5005006)(8121501046)(93006095)(93001095)(100000703101)(100105400095)(3002001)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123564025)(20161123562025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR0501MB2035; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR0501MB2035; X-Forefront-PRVS: 04371797A5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(39830400002)(189002)(199003)(106356001)(2906002)(105586002)(6486002)(6116002)(53416004)(48376002)(9686003)(50226002)(3846002)(1076002)(36756003)(103116003)(2361001)(76176999)(68736007)(189998001)(33646002)(66066001)(2950100002)(6916009)(478600001)(50986999)(50466002)(47776003)(25786009)(2351001)(101416001)(8676002)(86362001)(69596002)(5660300001)(81166006)(81156014)(305945005)(53936002)(16586007)(85782001)(7736002)(16526017)(6666003)(97736004)(8936002)(5003940100001)(316002)(4326008)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0501MB2035; H:dodo-dell.quantenna.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; BLUPR0501MB2035; 23:sKFkJxpk7oEMFymtVEdL3UduDoYadlr7+wYuF+R?= =?us-ascii?Q?oHFRf4RfnUYCgmf/0FQw8AphTvp73yreo6elkMj8KR/WZXce9CvmYsgN4dbT?= =?us-ascii?Q?/pUpOJ1syIzkDgXOy3o0Lq30GN/CHU6xpjuhun6vMe2vJpOR7TPiqYQyC8nl?= =?us-ascii?Q?+Ds1dFBXB2qNMdiYoV1pQCQ76mIBu2yWx+NK1FVLb8CBrccA2nmKhrGy7HXL?= =?us-ascii?Q?X5hoH4uQBqFY68fite/BnaajSqIw6XcJE7r14Mqwwkcn06ddzoxQvDPHGW3A?= =?us-ascii?Q?yOtNDz7N1EZcO8fB3XdaPTSMv+N+eUdt6yM+aanpFV1dJlGLWYULA65Jhtyn?= =?us-ascii?Q?q+RMltZ/NY9DAIxvUbJLbqnGpye3+KCy3C/RuuAnr05jb4W01MPZBR5Wshfp?= =?us-ascii?Q?j06ANcRTJk/3t6Uewt9IvWZBz+us8rYeYTyXqfwbHtb55ks1EqO9nbguko5h?= =?us-ascii?Q?XSXjgOnAX9NO3MbDi1JFCU4U0Q1wn9N3feGHGw/x8/oNM5eeOUgKP9BwSSuq?= =?us-ascii?Q?uAQZh3v9vaemJNJwK/crCNTNs0BllImeAjASrRF7k0uZddJfEuamiPLXfbHQ?= =?us-ascii?Q?abDSzc3J8H9QkZkkjZs2SUygGVUCi/egHENEEIibPrgCi8fa2nmw2tLZalRa?= =?us-ascii?Q?Vfm7wzUBEGhMmRLrGNObVXkk7noPjnpycrAV0JgAkOACLo5tvBApwozoMkWZ?= =?us-ascii?Q?9Q2YjURXfN53S+hzEcOIy4Q2fR1//7EdwFEsSSZgDHzH5ygovip2BI5YVAYF?= =?us-ascii?Q?Hbcjrf25BmgimXFy4Rn6qyMVQeJd1Lp4g4o1kQswmLIak6KFURnyWlX8Xl9t?= =?us-ascii?Q?tbrfw6ehSnW2mKISQTLtI6HeTBLAaAt2a13cGuPOXaKS54pxK5JT+unVlgHq?= =?us-ascii?Q?jQ+5zNXUss0u7Zo9B2LS39TE9mwWIG82MQjS1kfDDJiQSS432MbnpTiTnaNJ?= =?us-ascii?Q?ATHGy7w7Wf16Nn0QJ8U4Ul/yPGY3dFlLZ+rQZhj6GT7bXfu8y+cAwGcbOVbd?= =?us-ascii?Q?xjlyscca3GFmzMaGvbDKahWmByW1dsvoi9gJSo5LcmPghgeFUBU+oLHxN4SG?= =?us-ascii?Q?WY2NMotr3T9h0RSJ+27JeDqSuxvwgGMesyWvRQQOaRFaihl7lSx9PuKtjYk+?= =?us-ascii?Q?XILaD7M1/3aIVGjv1CL263pNXkhMQ8pTWDjh6WA03LcKoKyTP2H8gklJVKrT?= =?us-ascii?Q?dBW7MCwb2+dNQPWLbZjDIMk2NUF2PugUfxV95TTUWISHDZe8EDR9nIDl2nA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB2035; 6:AXkfCkZROI0nVSJuTwnrnD0jXeqpg917bQ6hbEnxLQVA9mLpViD3x5BekoIHLYq3VTi5NNd58LlD+K6uaQCSEMm9p30vVMJtERuC1l0XY0UTumB5lLJ3o2894k1aF8n44v914lc+DC5DQsPtShiGFj5wUx+1En+i8MkQ0mgrzsby5f3eUywuuHdsAiv/BnGah3KKbDrGDVLxMNGzAqZjIDvMmbKW4j3OvogJSvsxw4cw8URs6tuXfX9EyMOTLy587AKfZEVyaJfjUN/CcLPo6sLiV2rK8ampElKEVpVRdM4mzVnIOTg5A8sOs4UH7t1yDjoMlXr+L26TBpLyTGGvMQ==; 5:0QfDqYXY1j/ApqgnXELyscHUXLk5AprN+xeJL4G4MkkD8JbMwZGXE5MTpSGbvT3KQcJ+RE7uKQ38daIWFmPcc8aYHRXT2EQ12MQrnFuORW25wHrBE/DleB8mZRLA/eMDE1om4Qu0otA9Q0uuZ6bQQQ==; 24:d8+y7rz+J0iNxSxO7LGvckoyCWfq+N3A4vBtjEjeO5VzTReHChNE8+kEz8zcPLblytAoRU7XX9z/GT4aluJsS9CPXAZ2y9rp2HYWDUhtR1Q=; 7:3OBvxs6dkGWzYwt/Y2reB4NIyU79ISVK3aKczlAvgLMVfA23KBBMrmmxVAMuYQMriw/15XRQ0t4ZaPYrq+YOrhLhmj0EqZXbln5vSStqWTlyvFsnzKW9ZDbtmBouGfPOxhCwUn69P7NaCsd0JWRwNp0RVUx1BhI2AXYAhNnnnTqFoNMv1yCVHt40FnKd4AZCi7FvImqwxSatI12reVF6Q8k2t6oFP3sPPtUpA70kyg8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2017 21:35:00.6315 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a355dbce-62b4-4789-9446-c1d5582180ff X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0501MB2035 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 makes no sense because real operational channel is choosen based on AP operation, not on what STA is configured to. Signed-off-by: Igor Mitsyanko --- drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 15 +-------------- drivers/net/wireless/quantenna/qtnfmac/commands.c | 6 ++++-- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c index 0ef1285..17b323e 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c @@ -613,8 +613,6 @@ qtnf_connect(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_connect_params *sme) { 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; @@ -627,18 +625,6 @@ qtnf_connect(struct wiphy *wiphy, struct net_device *dev, 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, - NL80211_CHAN_HT20); - /* fall-back to minimal safe chandef description */ - if (!cfg80211_chandef_valid(&chandef)) - cfg80211_chandef_create(&chandef, sme->channel, - NL80211_CHAN_HT20); - - 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; @@ -663,6 +649,7 @@ qtnf_connect(struct wiphy *wiphy, struct net_device *dev, 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); else diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c index 806b88b..c55bae1 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.c +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c @@ -2055,8 +2055,10 @@ int qtnf_cmd_send_connect(struct qtnf_vif *vif, ether_addr_copy(cmd->bssid, bss_cfg->bssid); - if (vif->mac->chandef.chan) - cmd->channel = cpu_to_le16(vif->mac->chandef.chan->hw_value); + if (sme->channel) + cmd->channel = cpu_to_le16(sme->channel->hw_value); + else + cmd->channel = 0; cmd->bg_scan_period = cpu_to_le16(bss_cfg->bg_scan_period);