From patchwork Fri Aug 25 02:30:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mitsyanko X-Patchwork-Id: 9921169 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 A765B600C5 for ; Fri, 25 Aug 2017 02:31:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9001F2026B for ; Fri, 25 Aug 2017 02:31:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84D29205A8; Fri, 25 Aug 2017 02:31:07 +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 21A78204BE for ; Fri, 25 Aug 2017 02:31:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754499AbdHYCbF (ORCPT ); Thu, 24 Aug 2017 22:31:05 -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 S1754471AbdHYCa4 (ORCPT ); Thu, 24 Aug 2017 22:30:56 -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=URV63urE6hZWncT4+Pqq5Skn6Ukx/vAaOfJypHfQP6c=; b=uVL4UwDDvFsktpth3EgSfQ8KzHxKlsmyCkfFNbK9wAOeMQ/gF7ID8bANHx0/7SgRMJNQFWCwNVfZpdeq6c6yhK2AZZqcwWmEpLn3HhLlpZYN4CvRPFTAujAI8MSO3+Wtye5k2eM38gLgL/OQ4GiC+2OEQ/Mj3hoULSCqATXm5aE= 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:53 +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 10/27] qtnfmac: do not cache channel info from "connect" command Date: Thu, 24 Aug 2017 19:30:07 -0700 Message-Id: <20170825023024.10565-11-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: 29529535-88e7-454c-444d-08d4eb614f48 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:KgB+/dvq/tXwB1a0TCmmTucmZO2kxy9unqO2ah9AsFpIL9ODQN85KeXiNXYYr5dJJtbHgZeevye0uP5F25bsDICKKeG4+ASerjOzLWWW8PJtUENYte8ex5+xIwah6si0nqknYLezosgR2CkEw7OS/wMMxM4Wit2mNFLWjic36C1nxtAatiYzgQsp3c0t2ArWHOPRbi9eDH1uxYcM/haonV87CRJ1PrrsEJNqJANsGUXVf6YqQD4eYctLrAMP2NWy; 25:173QWflhkbfxqITuZcz6hU7xmtrLIVBXm08MGzKp0rHiK9+bzbmfTXB0q2vsIzwdjspNPxG8e5mCIZa8yxxiVZYrO+vQjGOM5r0kGb5wQN0SH+tiOM5yIBmTCyUpoxs3aM5dHfj4TCpZ89Devwi48y5bC2ocGOgY8UeiGwZ18/MFxv/eQwKsMsEbm36UzAW4yjxMh46ELCNUw1KXbvO4bVXpxg1kUUwzechp2NH0tBO3OdCI788BV/93fXsu4jI6hu+qLC/vWL3Qx7b/1bXhmZbbxcUPjohPo3r96NNsKHDoQBf/l4qWOC1ZIhyluAgvexk7MNZP+P8zvE8qFl3uXA==; 31:+h8yOiyYUgQsozSL3YiMSaf2csae096z9dAo4UOsGQay8fl4I92qGg5mcZC4VRRvoDtmBFgXpsvPyHYU7M0nKrxWxC/H+s6T8IH+ms01a3kcDkjX0OJp39YhlY31gEIHUuJjorFbxUQwEkeakNym5VdqXZyhIejrP2TSl4wDZt1y4tfl0KDKKyNnsAqglaF8PVcuSo6lAw88ykCm6UdPiiuf102UOi03VGdndasiWiQ= X-MS-TrafficTypeDiagnostic: SN1PR0501MB2047: X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 20:bfWCcA+PoRt/isDPH2eRjn55D9lDrdslwM4IF0UExInI/kkLP+NyDbT+RO/23S4ErKO++8NrhKSCH8+F1uIcaZf742EgjYuappIy5FvLZ0lebrC/DurTQMm8z8/z20Te9d0iS+LBskoOTtfMedpn5jHkZMt6BhysN2Xq9HxrigptwNIc4Eegk8FDHlgGppQUvfr1tecW0613Nryub+dMDzrxZQpHcZOKd9jCuINILzXj218uvpL4eHyW/u5WdqanLqZ0yhYRkBHDMUD84/I2G0gcQumdgzPiOW2FI5OmQprVDxQZ/cdC1rmC2WexsbKlyICTZzfwKe72beKPmPrxW+mNRrl2pq1R60F66k1w6Hki/jiyXWBMBGlcAclR7WB2cIaB9fcYR2odYnbA5Gn8KmYSQii+S/+mjHstFhdwMbk1yRKrVdXWHs/0+H4OWjE1oDvl4tsHHfyC9C0XUkPEWmZe0/bbZRDMFhzunpwKnTjbmwgmpjo0/8s78KRML6RGk6Mav15dlO/AA0TTsEi89D9onGCR6gJnZcE6wqfy1VBac8oysdIKL3qeOblG3HB31eo9uG9XxGjP8SCwgXxNqSKSQ5AEaILWiCmDFlUl3Gw=; 4:bD1p50tDGiO2ua54ZJ+/0uRMKT45wZkL7wnbo4l+Ujf2BqGQegzYLGtRPoYM4hA95JQXbZyM2QIrSXVu+4wV21+ynT2/8VjvxO0JII1RcWYV5QYW3PLMI2LdDpxdcoKejVP1+LRRmZIZo7tWAOo9duep6h8HenFx0zkCzwipkBtRK8Yj2eR2e27tkwHE6GUYcD70BraU/hPZDLBbul7rdJ7d6Bg2MEY8wh3762d8kMMiVy4R5EWmnWM2AiWxbnq15R0IUYWTShU2pYLXHL2bz351vAYAdXNkU5LQJoCqHEU= 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); 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:Xqe8k2jwcruSqNGgoqxA1c9ImbhkZGvj1DzVeC8?= =?us-ascii?Q?Kk15pux+KYPP+DFaRfOdAWrVpUZdBKM1I1VdQzNMmN2Rx6lTHLYXDfxdY7GX?= =?us-ascii?Q?ThK9TDG/cWqRpgy/r77hEdwIvBjLOjMUEMEmmefMaHvm4iA6VOEclrlw0Mdb?= =?us-ascii?Q?eeY0FDcj/9WJiX4UDaXMcTqhHgPr61f3eoFdXl+Qfw9ueJMW6kbAAV/rpTng?= =?us-ascii?Q?rodTfErMa6MbYz8Y52K1X9udU7plBH5VKqDvsd028wVNfpLZvDg7TA73R6zG?= =?us-ascii?Q?x7kuQmGo0s4V8YXDN9i7iRxAunVb+zN/q9nnkZJo8M9gm5WX85PbMdgMJJTr?= =?us-ascii?Q?zup4yzMTdIeqwB0DCVNAZw47YMDLLmNUMj7tFH/5xRE1i7acehz0wGlKwHM/?= =?us-ascii?Q?3IlnnIjFiQzPztBd4+7zg9WQs5x8yboRyAPha8VU2p+NtUteZ1kZVg4LWzu+?= =?us-ascii?Q?GiP5eOw7CNkesscBfxg4NKIZOhn7UQcEx1BvIIQfIVlJLKUFeRUDerwz/ogG?= =?us-ascii?Q?PmJGtCTD4rbPOcjUMTV70OjV1PMXXWJQLAXFSP+4DmVLf0Hs5aMmdJLddhJv?= =?us-ascii?Q?Dgws+0/HS+5Av/PAcSHI11oIi6jWYf3mfwiRCyxC5f/dXsO9YQLtPHORtM6Q?= =?us-ascii?Q?gIVFmdPj97vvowoq/ng/1Ld1/6AUTA1gNfUf/uR8hZqK1BU9pBC2JJk0h9fn?= =?us-ascii?Q?LNQSAKIFDch/TmoYCQTwSqouYfaWvQOzIbbyEX/JvSLXS/5uVySlXqnlvmcq?= =?us-ascii?Q?fb2QaKiyFc/8UPqOiMC+jQf3T8ZXH8RkNg6p4f7FpYjxiLqDK4n6U8G8SspG?= =?us-ascii?Q?lIRPNOBru81Ol1v6Wt5in8jIGxJRCBCKTcKRNvIW9K98eQzOXGzww5qchFqB?= =?us-ascii?Q?3P2v3Qp6SFcrdYEONRdwHgDKUoshuVBq23h45FvpBmulrQF26pA8iw3UyhiA?= =?us-ascii?Q?a5rqHmhHjN9izPIOO4ZHespXDTEBDgrT2Nek1BuwxccWivXdYWxI6drJF/0k?= =?us-ascii?Q?/S+Z/E5jv5O/sLGRzYoP1qex7XMBwRcYsYoPGWQVkoSYYvksrLuC9CsgAI/y?= =?us-ascii?Q?4c8AO4uNkIU4xNVnrbMydy+N8GcFTKZc5yBsbaCJ9+qjuijte7HVyZsIb75U?= =?us-ascii?Q?R9BRtxXSKoC4GY84uXaflqS+fZg0iVv4gyjt10ElrZYqE5D5Q9R8rqRjpDcA?= =?us-ascii?Q?xYXz/Waad1uIjLe3l1cyt7lXfCHprL8LaaZ/xxKlD4enQ558xP4MvGnFmoyD?= =?us-ascii?Q?MBPS20C1nVAm2OGMevziLgZB+kQbhQdZca/9wJ/S/O0pkXg+AmUzPFb/b4OV?= =?us-ascii?Q?XSA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 6:qVd8q//6kewC9xXey95Wt6xkjnsfyn3N9Ss9tfShOsepGHf80AbHG2c/9OgMiz9RuauHx+Kmcd+qgFIrCT+vFUZsqtwMduRWa2SK4cZBHGIMz9W9RwCob1YUeEJyZjoGqGSEwbh2D0ZQgUXNunpzqDRoTV3jC6HBdo3znlviDKrgO9wLxe1//5u+0Nhz6JKwyZiVsKfHMLp6Q8TARB0NjuxxpmjQi5UysTphbZJzoZTq9wbdrbeQtrsSpcnhGHFqnPP8RwZtt/zicbgOfWzJ0GQ/5WGJeTYuv4uLkMQprNW4JDeGzbVukrJxrG4MebDtoXdCAqTDf8y9aucKGo/8FQ==; 5:j5kKOt9Z4DC+HwoJ7F87nYU3gw9wDArJez8+ShcuLpYkDA4rstjO2lgaXM//6y6HlrqCGrL6o7VL6hVRWy1gsTZkGyQS6s+ruPBC6vC4VPU5x25U/t4CRSnSX9IiF3RmRRNT+qunjchujgjJt3QVqQ==; 24:o7YF+7+bkswqpQHF4MYMjgaKOAAdSDd+4N5AjrWnWxsXDQcS7QkSzdZa1Ezr4qz1g1d4vSMHeUSE9DNUmzP3CRZh5CrbBqlX8ece/VEcudA=; 7:Y3hDUlbvUOIMxOK6LAXg2OpB6ZLLYZg3rn154168WsPhmld0XoTjZzd4xNQVyn/78ZajjhvAI9cZ60dXFZ5OwOH9JCXGcj+6lTZByTWtt0yYVX+BSfF2q9koTFFlWWlAh1aEOVR0yzBmAKWsFJMGYvdWakkR7H3KHWxHfjnz/qSa1XEgmGuJEGfIUv3Z9yN0UXHzYiSHeeH9z2VyiVsNvFKPZsPec+ECDEVxRVi+pi4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2017 02:30:53.4792 (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 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 | 14 -------------- drivers/net/wireless/quantenna/qtnfmac/commands.c | 6 ++++-- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c index 9eb0c08..501ece3 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c @@ -570,8 +570,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; int ret; if (vif->wdev.iftype != NL80211_IFTYPE_STATION) @@ -580,18 +578,6 @@ qtnf_connect(struct wiphy *wiphy, struct net_device *dev, if (vif->sta_state != QTNF_STA_DISCONNECTED) return -EBUSY; - 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)); - } - if (sme->bssid) ether_addr_copy(vif->bssid, sme->bssid); else diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c index 7dbee42..65eee2b 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.c +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c @@ -2054,8 +2054,10 @@ int qtnf_cmd_send_connect(struct qtnf_vif *vif, ether_addr_copy(cmd->bssid, vif->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; if ((sme->bg_scan_period > 0) && (sme->bg_scan_period <= QTNF_MAX_BG_SCAN_PERIOD))