From patchwork Fri Oct 20 03:34:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lin X-Patchwork-Id: 13430002 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA315CDB47E for ; Fri, 20 Oct 2023 03:34:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376259AbjJTDep (ORCPT ); Thu, 19 Oct 2023 23:34:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346920AbjJTDek (ORCPT ); Thu, 19 Oct 2023 23:34:40 -0400 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2085.outbound.protection.outlook.com [40.107.21.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 359E2D52; Thu, 19 Oct 2023 20:34:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FFTQZS0nlavBykIIH5il10F9bju1fx2kbfz8lW27EVnocUoC5L8mBS8wcNZXjpqPg4LSH/8Sdzjxn5oT8z5GjvqLJTzi71a8VAKliVVfHl6wbRbYnp1uzrY5/URyiOj/9xpkJAxML3c0k+Ov3z5K9R0G2fJHZh8rbPDbPMM6Ib/jAoScNrgx5312FGCtz9reLdaB1w5wa4DDW6YSJak0xBYqPONJp9v4UBvdc9JZoOUpnNmZmb8CMDDTTINm9CAFWb0QklP4SN9eyMQ9DIsMbTgdzL60CWrYD3Ghx8TewU07H+8B5v+/r2S8o1G7M27eaRdj7kRPRo36Lm/jIU/1bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Reafhm3bZC4UY7sdDkNCyJu/1eC2l1idzHlyhmhgYHQ=; b=HtmnY5PjEUhAGVNBsRmyKPYNLZBB2bcM8lu9ymiwtbPfWL3leNyPNC5zZrcwDcrzVLZGuw6d9EErfIJrJ1s5JPOmQz1IUHHmBTV6AyYRe1PyO1K6boAclmI7rIJAGynedTm6+wfI13CrQnopsdFFEAWJsTFIUpunV2qnFeC1UeEoIM4uIjsxv9PrYyQEgBKkxhWYbIHSERFhOAtZnnrMkNTxaHOG6Q9m0SqqCKyt3JYvQVXBuBFiNaeUFExuNmd+K2Z15zu+VSXUYfAWAtURZoWjisvbEW9JjKPp+HbN6w7j+EjDZVcBrx+vnC+0BVS4TuutgqAdrEeo9NXcrHq7dw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Reafhm3bZC4UY7sdDkNCyJu/1eC2l1idzHlyhmhgYHQ=; b=mu6JMbftE1AF+iApPTjT/zZHtWrD3iirDpJQepfMNdp/+uNQT82aPb2isF9Z58Ropc9XRDxWCz/R52t0oXbrCl7zPTgSnn6AJtmBYuKq29Xci/CHr/wtJp4Vr1F8D4LC9goxo7gKBsFr8RJQdzuB00PYMtzgjDtxuyPc+Ui4EoU= Received: from PA4PR04MB9638.eurprd04.prod.outlook.com (2603:10a6:102:273::20) by DB9PR04MB8236.eurprd04.prod.outlook.com (2603:10a6:10:245::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.34; Fri, 20 Oct 2023 03:34:14 +0000 Received: from PA4PR04MB9638.eurprd04.prod.outlook.com ([fe80::34dd:289e:9e8b:9c9b]) by PA4PR04MB9638.eurprd04.prod.outlook.com ([fe80::34dd:289e:9e8b:9c9b%7]) with mapi id 15.20.6933.011; Fri, 20 Oct 2023 03:34:14 +0000 From: David Lin To: "linux-wireless@vger.kernel.org" CC: "linux-kernel@vger.kernel.org" , "briannorris@chromium.org" , "kvalo@kernel.org" , "francesco@dolcini.it" , Sharvari Harisangam , David Lin , Pete Hsieh Subject: [PATCH v5 4/6] wifi: mwifiex: fixed missing WMM IE for assoc req. Thread-Topic: [PATCH v5 4/6] wifi: mwifiex: fixed missing WMM IE for assoc req. Thread-Index: AdoDBksI8PsS8zjfR6mgaeybO4vo6Q== Date: Fri, 20 Oct 2023 03:34:14 +0000 Message-ID: Accept-Language: zh-TW, en-US Content-Language: zh-TW X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PA4PR04MB9638:EE_|DB9PR04MB8236:EE_ x-ms-office365-filtering-correlation-id: 36184e6d-431c-436a-92f0-08dbd11d6e8b x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: J2yWZrkGyMZOvTPGuX1I8DbkpVR4RaN8zMJp+nTxjgVK0wsxeVhEyCGHff6sXUGtfzeRiYZ2HQkxOcXp0hFRaIHdfBMA5WwZ21+5Qa94w8RlftfiTBtPTlxTsAbVl32sH7OW5GYfG7YvRExQRsDiUT/ejT0k1Oca7ja1llw/33pD5xgNJnBovKeq3qQEF4Nl+4dNxODyy0p3h2MUFFctrIohcpbi8TNG5kT0ZxVpSL5V4pWCU3RghxYk8II8q837iCEb83Jop9b6oY1w2Plr0EfXjC+Ac+TKO0mpRbWFV9rV84yxYaGXCM1WPw22b/32AyZ42+DzXJBB2r7IvZ9S5Pmp7VShGiipHWX4LpzzaYMyGI2ITa0tqUuzXMr5BpZa2UWiXcdHzFKMJEqtOiuweSWOuaSGg+9IEQM/F7cLVFTcAmGxJbxXGz0t/FnvU8ehX46lHrfcwXVtVHLIyIzztXcdG8AtW8Ic8mz5tL8yCoC+KSlSreKSgsNKxo0dvM3/vVRQlG9D6bLgkzq26jI0flbEPq0pETfY385sRCD/bMYl059Vmjj+a5rd7WO4B/Z6QkaddO1aJm2VJ9xWGOPQCx/Mkq95sd5z8cFzDw1TvM3cAmQMOwD4hZjzjlCQ/SLs x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR04MB9638.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(396003)(376002)(346002)(366004)(39860400002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(38070700009)(66446008)(38100700002)(66556008)(33656002)(64756008)(478600001)(66476007)(54906003)(66946007)(6506007)(6916009)(76116006)(71200400001)(2906002)(8936002)(5660300002)(8676002)(52536014)(9686003)(41300700001)(4326008)(86362001)(316002)(7696005)(83380400001)(122000001)(26005)(55016003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 4BlFM9HwVI5CghU53X7PcZhSgCZAtc+t8hNkdnymQJKv8cawR4b/MU7g+fgRruxSdHl/1OB2ByVp6l2k9OBpre7dO88Fxf3vX7luy8mCogTXjqK8WNiF+/4N1PrCj1Wr8EsXmPue3TP1WmLMhJWy9iQcq2OQD6IIFgI9qu7oQFpwP4deTG6tAZeVVNpB99uQ4L8ZbsfLeRwl2XHTDMGRHcisC8qaPve7Yb374HvsP4x6qEn4myyNghpUGl7UhVt6g32Xubap+qVek5LM8J6Onmr2QSHXRLulRTsRF8qYYKtH4AJ6FSiLj55y17ez3nVUHmdtpTlFH0flaQAjC7htrNnl8MjE9FawsioPMiIhkqopE8LQHDI1piPY61/UJxjuYnXUwiKju01BVCuFnRrGNlxrxCfbRDHr3uPaZuZ/DEIbmjNOfrtlUyWEixuikCr479bEY5rt7cBpWJNnafO4th5DWoi5Mfh2uNtGscQJWuZU9mK7sXuuoTTE6ZnTn3hcjKnIXu1pDrD3MTybFGxI01wEAtnSlHEXn+VTI9NW5/mEH1rNhhXoCANEjbGWMC0IIetREqlDieaFCRVKYn6B7LiC7z+DCQyjlb+QYK0NtqAG4rloTiVioSXqtoTkIT8vlDx0PD/SfnQkTnk5dKCmxRm5CmJp9YZfjvEpHlwSU4l8SqzqMLECjN3/8zNCvkCBMa7nA8VcCQlhyX8YI5OS1BsQeeXZuNblQma7dFyF4eaV64LsHI/Sfk7DjPTWG1GLWgdfxlPcduCfdbqG1XE7yctHaJq3tkKRTxBdrzrzEuoDzxlxtS+9lUrV42CcKeqJtccf90QXsXp9llW2crkTJeuv3CJHsnKHuPwz0fH0XgiSmzAuUQQW9v06UiUAZGKCTqXIay4LDuoWPNynd81TPgW0nM34E688pN1WfoHLhqj9vqkigtLzPUOgLrS0xYk7FMUuDtwnMtCITXv1ihLQxfq5sA6rRV5UEim1N+04n7ObIeeR0qqK+gd5cnJejEa0GP2M9roh3LyxUnA8qYU85bBkAe0SMGz737L0INJOKobkv5UlFBy2MhiqIvzZ/QC6kfGPaV4zJ6s6A1jQ08SvgNh/cLTu9Ls/rHmONiSPNT0rdXVOSioXyQ5tbD20fUMBuWilgWXFmIsMSmNsgHhgQEKom7eZPij2klcX7ZePF3UKRo/zkRNCtSW2gceTisNQ29r/SMD/jeR6Qpl1nVwBBquBeHeuu17UBd8dpIv9BMsYBhD5h1bL8G6U7V7T82qGslmFeIQcZcudmd9aUJfoAWbnnbHhvHE5crBM2OeKZKLgncpSB0uZJGRA22Uy2drM4fWE0X1MXptQSEEaYcaM0oZ6YToQPxi0UGLz21x5+g3olepCtyt7NrHtc5xbIOAsu1G5a72WDC6QSv/P7Fh2Jh7aZ/uTkdu5KZ2adqJCBxmfFfR/+BNQVotuGmfxpG0eKf0HutDujjWMFV2Vrz6Ni0VVoB3MfQCRbggT15zXZlLvn1kYe4o7+xfPAfpiH0oybrX35DY+bWetZ7sr23yOK6Zg6HbgPY055avgCnVyQYQQqkh9RsEeJNVYOxR3Xyb+ MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PA4PR04MB9638.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36184e6d-431c-436a-92f0-08dbd11d6e8b X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Oct 2023 03:34:14.1566 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: dLXFjxjCC9IzoQocFS+lvF1xIHedDlc18PfAfQIYunlhLAB8PkXeEjSAyeSNJ2jOwwOuFtky8+bkdAnGPPojZw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8236 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Remain on channel must be removed after authentication is done. Otherwise WMM setting for assoiation request will be removed. Signed-off-by: David Lin --- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c index a21310f3807c..b99de9f4ca14 100644 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c @@ -4306,6 +4306,8 @@ mwifiex_cfg80211_authenticate(struct wiphy *wiphy, if (!ret) { priv->roc_cfg.cookie = get_random_u32() | 1; priv->roc_cfg.chan = *req->bss->channel; + } else { + return -EFAULT; } } @@ -4418,6 +4420,16 @@ mwifiex_cfg80211_associate(struct wiphy *wiphy, struct net_device *dev, if (priv->auth_flag && !(priv->auth_flag & HOST_MLME_AUTH_DONE)) return -EBUSY; + if (priv->roc_cfg.cookie) { + ret = mwifiex_remain_on_chan_cfg(priv, HostCmd_ACT_GEN_REMOVE, + &priv->roc_cfg.chan, 0); + if (!ret) + memset(&priv->roc_cfg, 0, + sizeof(struct mwifiex_roc_cfg)); + else + return -EFAULT; + } + if (!mwifiex_stop_bg_scan(priv)) cfg80211_sched_scan_stopped_locked(priv->wdev.wiphy, 0);