From patchwork Fri Aug 25 02:30:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mitsyanko X-Patchwork-Id: 9921175 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 6952E600C5 for ; Fri, 25 Aug 2017 02:31:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F75420453 for ; Fri, 25 Aug 2017 02:31:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4412D205A4; Fri, 25 Aug 2017 02:31:14 +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 26F5B204C2 for ; Fri, 25 Aug 2017 02:31:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754519AbdHYCbM (ORCPT ); Thu, 24 Aug 2017 22:31:12 -0400 Received: from mail-cys01nam02on0057.outbound.protection.outlook.com ([104.47.37.57]:63780 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754480AbdHYCbK (ORCPT ); Thu, 24 Aug 2017 22:31:10 -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=zuAXQCKgk9wCy5Paf1X97jspMCihtbFkem7RM5hCgpQ=; b=k7LJ2yzav49D2x1nD1OCwl+eUYvZre2MIGUj+iiQYD6elZrUMb2rI/nUQkK23i45aMGr5YdxDeVsg2C8Xr9lYgrZMKsplEOpg/yb8GrnQ+grwJ98QQMSLDmFo7GpURoL2GoO//2rU8UjeoJDOYBXs5PrQRqD9e/4ZxjZL//KW7g= 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:31:06 +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 24/27] qtnfmac: configure and start AP interface with a single command Date: Thu, 24 Aug 2017 19:30:21 -0700 Message-Id: <20170825023024.10565-25-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: b4217076-c58f-4fc8-5e9d-08d4eb61570a 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:WjI+g7Us+ZXqKJtCObUaERw0+c0UKKps+o/p8nk7dfkMe1bV1Vv/qTNjhY9lfKzm6AIA4f+Ky8N70z3QBe9L1XoxwkwV8nG0MoijXQrWc1eabGKz+wIuerVCGzvjQsFHLsXZ8b2ZYA/C7OOrrSIz2YjmAbzGuMfL6N3vbY1vLGyOlmt5aoak7R/phfCmyGvjcgsDenArDhzydU88kcN04ko/fSZtcWsRffQgBLZKlPnxjuy37gsydVsKH1afCep+; 25:OtqK8M3rMcI8XjSNXt222Dl6faV2YPrK2FA7iBzdH2jOVl5HpE+R2sNIuDEjMjfijpANrBCcyvDuYZ6hrcn45vTZgIVzud7sogrSwVNbuLpMrBUWmhGXEhtZC+90ddMZsUzshksoQ+qgpjoBCoeRuL6ERb6zn3AscE+MnumoDwo88h+unF8TA9dO2ShWolO+Vk1LHbxfdbv2+xjBMjCWLP+4rOoQT/jgjDTjM9h3nE1SY+/FP7Mmml+0lPVqY4YGtgAwkpj3a4wllMwoIbBaRPz6eQifNza3t6BKXJNe6zIEnb9V1aaJabKmhVeqKUJV8AVJaFHkscLNiZC/cIoGVA==; 31:jfCZzOgLWJJppPc/H/yTnuhjl78PIutOa1Gu18m9Auhub6xOokzC8icojr6p7qLt4hN0biJGOmtkVJ9vYaFf953RDcd13136wRXojGCFBsXGBeQsdA0jTv3GxGnlGat0pCYv9c7ZbX3ZSdwm71JRkwjEch+yvH15WtneBq8ZZ255Nto/8fwVDHAFia2ws9Rfh13NJZ2d4ekNpyvAjijwGodtJxBb3wGQ5XsESV3qGxc= X-MS-TrafficTypeDiagnostic: SN1PR0501MB2047: X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 20:f0SaiG+BZz4xBhhgoX++eI5zWZnm9Ci7m7uSUzBqet2g8fWtcUvHtRBoIC1sViDNuuQjxZ1js6d+UT7HxRSB+WlbOW3xAIyBBrdZiC51IMVov3pAh3SCobH7+CjqqE8jmGwYdybKQpZ2Py+ekRHxgwarDCBbBFrVkZe6s1RUDaftLxIwEesbLdgjHMfCHQkquBZVU19JiE7mMM3wd9v3SiSUqAJFhbyf7ZdVJJq05ySAxndjfOJkadfru33WYXpSX02tiJbdruaiaSzTQFh3+KBfGb+DkCNvrMK9g8PSIYBsqWUQrHq5SVWZjew0bFlQHrBHHPpSkosVvUXxZTTmiEvUIiDXEkuIliMkQvntFID0ZfYDOMhCrhG26UOtUDsEP0kxPxGbEPWRyQMINQHl9ZTdJ0NiWK7oyMzpQnXjCrqRjXuoyHgCxvQ4K+MFgR+cPhpzCFexuUbx5NNOjLLT1dSr3aFo+N2MLipswfDHD69zHYOJS4I1zzTtwSeJWMW4A/HgZi5zhe24tsiIsQovLiKZN+5JXP/071ay34lrSFcPlC3XP9MRjXRXl3j7Vo01YDSndbmGXLQoldtNPkPvbZkDAytDmhELaxeF2Un+8t4=; 4:OYs3d2VLnvUPtX3E/hjz6Z9BeaKRO+LwWEgHAQE9joiGDzsP0BmwXevCMPjRMwA4sQkKmGBAJpLEFEpr9EnuJMvwACi8Bi/yZK9mE7sKUCENbczDKjyOA5AElrcxpmZssoikKLkzqhTqZk9omTb+up7L1Nc6aI6tLp7DK//dNwOvTXompulC5N49Lklcl5z/xYL1c2pB2+EPBu74/vP9MRbPL3ACcAoPLIo4CoJQQ528Hyn2gKiZymxmKSDh1KVW 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); 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:nz+3e7eNp2AGh9YfZy3vXXXxNUEp0BI8AOgtMb4?= =?us-ascii?Q?rDSb1so7iT1ZFQLmQxrN4bhIVFCPwKSVOs8OlMuuRYMeQnHm7jrwTK4UdKOc?= =?us-ascii?Q?GGyA0rX7Vg7hD/tl6Grzj9o6tPk+aqwe+xFZH51tHQkM9xIng/xH+fJ2pwHo?= =?us-ascii?Q?qN62KVyLIq7sO+qhcsCHkYJRguhhVZHVPv/Ik0UG2yAwr0CoXBJt8mqzgDLz?= =?us-ascii?Q?Lm0wkjqlQqI2aWGpEBqqYXKLHPaEOuhgkpFtlgZWFN7VSzEXPAInR2bQvT1e?= =?us-ascii?Q?//vhpBvhGIchSpBPGKtGZ3ihx5Z97RiG955cCUYN8NcUh42n0gG63PTqNRnJ?= =?us-ascii?Q?yOpt4dBAvZZ2fSSXPAF/o64M4W+bK3TAiTo/g2Iy3nV94qTsFH8D9oAoSZ/J?= =?us-ascii?Q?1vn6VZVllXGc1hx8S998VnpXBqL6e+LwQ8gDr+hT4GwVG0KL7qRcoa8y0exL?= =?us-ascii?Q?FA1RtcYsK6Vqkhb4y5cNSVkTQ5t/Q61L16E2nm8w8zMrQOKMgl4GnpOL6jBF?= =?us-ascii?Q?0/uUzBW8SHnvOi6cIOSi2G6fRAucZ5sW/YhdUiczPLiThZog50xOqBZ6reAo?= =?us-ascii?Q?7engve0X6tnQvh1DMLaId/Sf+FfN1a34qk0kRIVBidNpcfSesi7OIdh2rZqB?= =?us-ascii?Q?qmrkQ1ubmKS64QjfNEg94k6NJhQYzNKWY146Zcw6PRgR2v/I3CuXZYuHpZTM?= =?us-ascii?Q?IQJpyvFzpfT6xkBm6+EIOLenUMnRksSbzdGUAS1Oy3e2UBP6MGrEeKd1jxoM?= =?us-ascii?Q?oHpAKGRmB5cFvn3C5K9xq2i5Sta8q5us3TFhbdtii2wbs/M+hhcRjvu7CC5j?= =?us-ascii?Q?dNvTi2BIsGYa09VAqdFd/QMDBIgoxX5/CysiURbbT70qn1l/Oc1u9pYtR4YV?= =?us-ascii?Q?KmzvwJQLFKI9B2uUnpbMDZyGyR9ftMugVsfiUzK7Q5j5MsWqtmA+pFg++OI0?= =?us-ascii?Q?syPbFUEbV8AZ/i5nrMJoTGYbr2ehyEXUY+7j176RPoQidnunbhfEho5zkBEA?= =?us-ascii?Q?pc5WVByQHyNa9in/Nry4TiQzGm9pxqW0MlsCg60ZUn0aQaIP8KDqSpbvP573?= =?us-ascii?Q?rae8r0ge26yYpDMiDJIe0MS38hyWHBOjQI3V20dW9g3V38sFUj9QQMLa37ei?= =?us-ascii?Q?L3Qgob2tPnQk1v2Pp96RZ29/YDlITXqPBUfx2CNNpF34ToKS1bwdO5flQFGn?= =?us-ascii?Q?HVvwWRLcrymFsuCo62Nv1xAnoh3jfIdF2I4x5VIBwZn5nwQXmCE3KAMMzdXY?= =?us-ascii?Q?nBJHwI2FE8U3rsWAEbSN0Iny7DCjIwCC3Rpx1Pdkz?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0501MB2047; 6:2LbGtLTqa1kgttBYaTYiu7rIxpZkM1EJLxOklS0RYQH2RDOjK8hFMyyWLFTzra7pmrRV74OoCPj+21ULNQriyypE7TAe2Gkzb8WYVhOv4XFzc52psauFJTXahQwV+nY+pIegst/lRmZvE+CFTGCjJtfmtH6KcSaVxyBZK4SUI7hl0n33vwiBsLz/LUQklFf5G3rX2Jv79YB9+teeS7B29j3prkvoLXOVNTesHYZe+LL8aMq/JAp4qQus9cRe/oX8GEUVjRNNsoadKsHlIj8QF9Z+tjeYt1U7By+Kf6JPvBdoHNZ6nNgCCn7ZfmlXP1FfW2KIrFii+9/yjiwyOIQI2w==; 5:MRY+c71D42M/vlw0cWs8+GWqpbUiPITbDCaYg0aDjzSELg8WWZvMmolZm+lAqNxF1+ajZ7W8PIszjfrvcQ+lXJbLgoV3pcssjfK2ViLo4hOAIgib1oqMJq1CQ7gipsRI8SJBybGR6E5oduQQqR/j2A==; 24:2FfX6/AflXk5sjC0R3RFOkFDSNsW1UMPcGAw3EfRBFHXhCoul6F2hfZ+gAubka4k5LFJJFvE+GcGZu9sWL8SGgpCbwny3CpdJxQzVEov4uE=; 7:C5GMohxt26HEC6ssa483IqMEyzmjOfp170gRDvGEVrXFlJ2jd0zVZKvbmPEQAvBlzLlJVTgVHHE8eWub//SksJGTXVwY+1X0wjecMOVJJJ4a9WjDOcCTWryq8w1TO6hcDjc9BRpkuw++VlANoeBIW1ImRkNlsafpnxzoBIl8XEW7b8M1xhp6UwsZ91CNAGWSDWh3q0FnJ47nSmMuXkRkxhgRvYztKrRmycn9WMLRaxY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: quantenna.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2017 02:31:06.4953 (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 Current logic artificially divides "start AP" procedure into three stages: - generic interface configuration (security, channel etc) - IE's processing - enable AP mode on interface This separation would not allow to do a proper device configuration as first stage needs to use information from IEs that are processed on a second stage. Which means first and second stages have to be meged. In that case there is no point anymore to keep third stage either, so merge all three into a single command. This new command carries all the same info as contained in "struct cfg80211_ap_settings". Signed-off-by: Igor Mitsyanko --- drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 17 +----- drivers/net/wireless/quantenna/qtnfmac/commands.c | 72 +++++++++++++---------- drivers/net/wireless/quantenna/qtnfmac/commands.h | 5 +- drivers/net/wireless/quantenna/qtnfmac/qlink.h | 5 +- 4 files changed, 47 insertions(+), 52 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c index 2497493..d6ddb4d 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c @@ -266,26 +266,11 @@ static int qtnf_start_ap(struct wiphy *wiphy, struct net_device *dev, struct qtnf_vif *vif = qtnf_netdev_get_priv(dev); int ret; - ret = qtnf_cmd_send_config_ap(vif, settings); - if (ret) { - pr_err("VIF%u.%u: failed to push config to FW\n", - vif->mac->macid, vif->vifid); - goto out; - } - - ret = qtnf_mgmt_set_appie(vif, &settings->beacon); - if (ret) { - pr_err("VIF%u.%u: failed to add IEs to beacon\n", - vif->mac->macid, vif->vifid); - goto out; - } - - ret = qtnf_cmd_send_start_ap(vif); + ret = qtnf_cmd_send_start_ap(vif, settings); if (ret) pr_err("VIF%u.%u: failed to start AP\n", vif->mac->macid, vif->vifid); -out: return ret; } diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c index 2e30c26..1965061 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.c +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c @@ -162,56 +162,51 @@ static void qtnf_cmd_tlv_ie_set_add(struct sk_buff *cmd_skb, u8 frame_type, memcpy(tlv->ie_data, buf, len); } -int qtnf_cmd_send_start_ap(struct qtnf_vif *vif) +static bool qtnf_cmd_start_ap_can_fit(const struct qtnf_vif *vif, + const struct cfg80211_ap_settings *s) { - struct sk_buff *cmd_skb; - u16 res_code = QLINK_CMD_RESULT_OK; - int ret; + unsigned int len = sizeof(struct qlink_cmd_start_ap); - cmd_skb = qtnf_cmd_alloc_new_cmdskb(vif->mac->macid, vif->vifid, - QLINK_CMD_START_AP, - sizeof(struct qlink_cmd)); - if (unlikely(!cmd_skb)) - return -ENOMEM; + len += s->ssid_len; + len += s->beacon.head_len; + len += s->beacon.tail_len; + len += s->beacon.beacon_ies_len; + len += s->beacon.proberesp_ies_len; + len += s->beacon.assocresp_ies_len; + len += s->beacon.probe_resp_len; - qtnf_bus_lock(vif->mac->bus); - - ret = qtnf_cmd_send(vif->mac->bus, cmd_skb, &res_code); + if (cfg80211_chandef_valid(&s->chandef)) + len += sizeof(struct qlink_tlv_chandef); - if (unlikely(ret)) - goto out; - - if (unlikely(res_code != QLINK_CMD_RESULT_OK)) { - pr_err("VIF%u.%u: CMD failed: %u\n", vif->mac->macid, - vif->vifid, res_code); - ret = -EFAULT; - goto out; + if (len > (sizeof(struct qlink_cmd) + QTNF_MAX_CMD_BUF_SIZE)) { + pr_err("VIF%u.%u: can not fit AP settings: %u\n", + vif->mac->macid, vif->vifid, len); + return false; } - netif_carrier_on(vif->netdev); - -out: - qtnf_bus_unlock(vif->mac->bus); - return ret; + return true; } -int qtnf_cmd_send_config_ap(struct qtnf_vif *vif, - const struct cfg80211_ap_settings *s) +int qtnf_cmd_send_start_ap(struct qtnf_vif *vif, + const struct cfg80211_ap_settings *s) { struct sk_buff *cmd_skb; - struct qlink_cmd_config_ap *cmd; + struct qlink_cmd_start_ap *cmd; struct qlink_auth_encr *aen; u16 res_code = QLINK_CMD_RESULT_OK; int ret; int i; + if (!qtnf_cmd_start_ap_can_fit(vif, s)) + return -E2BIG; + cmd_skb = qtnf_cmd_alloc_new_cmdskb(vif->mac->macid, vif->vifid, - QLINK_CMD_CONFIG_AP, + QLINK_CMD_START_AP, sizeof(*cmd)); if (unlikely(!cmd_skb)) return -ENOMEM; - cmd = (struct qlink_cmd_config_ap *)cmd_skb->data; + cmd = (struct qlink_cmd_start_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); @@ -255,6 +250,21 @@ int qtnf_cmd_send_config_ap(struct qtnf_vif *vif, qlink_chandef_cfg2q(&s->chandef, &chtlv->chan); } + qtnf_cmd_tlv_ie_set_add(cmd_skb, QLINK_IE_SET_BEACON_HEAD, + s->beacon.head, s->beacon.head_len); + qtnf_cmd_tlv_ie_set_add(cmd_skb, QLINK_IE_SET_BEACON_TAIL, + s->beacon.tail, s->beacon.tail_len); + qtnf_cmd_tlv_ie_set_add(cmd_skb, QLINK_IE_SET_BEACON_IES, + s->beacon.beacon_ies, s->beacon.beacon_ies_len); + qtnf_cmd_tlv_ie_set_add(cmd_skb, QLINK_IE_SET_PROBE_RESP, + s->beacon.probe_resp, s->beacon.probe_resp_len); + qtnf_cmd_tlv_ie_set_add(cmd_skb, QLINK_IE_SET_PROBE_RESP_IES, + s->beacon.proberesp_ies, + s->beacon.proberesp_ies_len); + qtnf_cmd_tlv_ie_set_add(cmd_skb, QLINK_IE_SET_ASSOC_RESP, + s->beacon.assocresp_ies, + s->beacon.assocresp_ies_len); + qtnf_bus_lock(vif->mac->bus); ret = qtnf_cmd_send(vif->mac->bus, cmd_skb, &res_code); @@ -269,6 +279,8 @@ int qtnf_cmd_send_config_ap(struct qtnf_vif *vif, goto out; } + netif_carrier_on(vif->netdev); + out: qtnf_bus_unlock(vif->mac->bus); return ret; diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.h b/drivers/net/wireless/quantenna/qtnfmac/commands.h index d6fe3cc..d981a76 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.h +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.h @@ -33,9 +33,8 @@ int qtnf_cmd_send_del_intf(struct qtnf_vif *vif); int qtnf_cmd_band_info_get(struct qtnf_wmac *mac, struct ieee80211_supported_band *band); int qtnf_cmd_send_regulatory_config(struct qtnf_wmac *mac, const char *alpha2); -int qtnf_cmd_send_config_ap(struct qtnf_vif *vif, - const struct cfg80211_ap_settings *s); -int qtnf_cmd_send_start_ap(struct qtnf_vif *vif); +int qtnf_cmd_send_start_ap(struct qtnf_vif *vif, + const struct cfg80211_ap_settings *s); int qtnf_cmd_send_stop_ap(struct qtnf_vif *vif); int qtnf_cmd_send_register_mgmt(struct qtnf_vif *vif, u16 frame_type, bool reg); int qtnf_cmd_send_mgmt_frame(struct qtnf_vif *vif, u32 cookie, u16 flags, diff --git a/drivers/net/wireless/quantenna/qtnfmac/qlink.h b/drivers/net/wireless/quantenna/qtnfmac/qlink.h index eba73fd..9a913b6 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/qlink.h +++ b/drivers/net/wireless/quantenna/qtnfmac/qlink.h @@ -183,7 +183,6 @@ enum qlink_cmd_type { QLINK_CMD_BAND_INFO_GET = 0x001A, QLINK_CMD_CHAN_SWITCH = 0x001B, QLINK_CMD_CHAN_GET = 0x001C, - QLINK_CMD_CONFIG_AP = 0x0020, QLINK_CMD_START_AP = 0x0021, QLINK_CMD_STOP_AP = 0x0022, QLINK_CMD_GET_STA_INFO = 0x0030, @@ -533,7 +532,7 @@ enum qlink_hidden_ssid { }; /** - * struct qlink_cmd_config_ap - data for QLINK_CMD_CONFIG_AP command + * struct qlink_cmd_start_ap - data for QLINK_CMD_START_AP command * * @beacon_interval: beacon interval * @inactivity_timeout: station's inactivity period in seconds @@ -545,7 +544,7 @@ enum qlink_hidden_ssid { * @aen: encryption info * @info: variable configurations */ -struct qlink_cmd_config_ap { +struct qlink_cmd_start_ap { struct qlink_cmd chdr; __le16 beacon_interval; __le16 inactivity_timeout;