From patchwork Fri Oct 20 03:34:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lin X-Patchwork-Id: 736598 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 10E24C001DF for ; Fri, 20 Oct 2023 03:34:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376265AbjJTDeV (ORCPT ); Thu, 19 Oct 2023 23:34:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346947AbjJTDeS (ORCPT ); Thu, 19 Oct 2023 23:34:18 -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 443CFD6B; Thu, 19 Oct 2023 20:34:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BfVsae5RC/CD5dbxbskTzJdTOMolDSe0V2aND49REis5NA/hSlks9c+QjUZnXFcFBdSq8fSubQ6qUVYUNRWFFrHwJWZNgCsbFg3FOCNAqLwtooALz/pw90AIw0pZwLObuHEtsnALFpIK5+uxU+IMHifIJ6I6zom/BUIrIf9mMNLUv9fPcPG9qvamPkDWsVx/yeIvFufHAXHOqvVhOsXHRxBWVV/XX/kcYL1WMWEBnINf9A4odI8sxljM7Psu0wLLfOJz9QRPlMY2lfem0cnPtFG0FqtHgjID7NSHL+L29EuUCzu2q0tCmvjZgfmp5J3QZ/309kvW9sbz02Sa9zH5Yw== 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=kSDFf+diQUzWFavfrz8vXQVQuP22O58vGaLwxYQ64zc=; b=O3VibzTJZxZ+DKL24h0Z7O5yUG2Unx+PCYV2hzJKBI2GJ5D7GMuwGYMOANobOEDLAtgL0AbhznbGVVHIZ/PsfLZXZDpEdUp0Ic98Hp9XVwZLuGCtnMQbt0HQdjYRT1xfvaHl02YhltCAl9xdZESTbO9Q0gwFng56T/rAZG+cIaewjuV5yNmr3iqTzLc+R7v5BU8ALEotIFxAdGeLc3LwQmKusDFm4nygxI5l6b8YZn/7jIVlZAg7XsWTy3oCau/F379C2UOEtDQeJhVaw6apOpiqOknV6yBnpOKUUco6iTy9k95tLuY812xuxK+iJmT4AWr61WCduS7ECD/Mq9jb9A== 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=kSDFf+diQUzWFavfrz8vXQVQuP22O58vGaLwxYQ64zc=; b=UJcUW2OJUrenk2WpWsOtu/T+weZexi4cQWDOWq3wjQWAdCXzXdtrRcxf6EH/Zlkra3II/Pxubs+rOW6j1hc8q1gTsdeJtMOdArwzBk7wZMJn4GTHnDmG/QKwASb8YfyIBGHHzLftHEQyzppNjJWSJadvH9/FH+CUxKF9LRiI0PA= 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:08 +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:08 +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 2/6] wifi: mwifiex: fixed group rekey issue for WPA3. Thread-Topic: [PATCH v5 2/6] wifi: mwifiex: fixed group rekey issue for WPA3. Thread-Index: AdoDBkd5Cmqyq+6nRdaF/U9AWpwe9g== Date: Fri, 20 Oct 2023 03:34:08 +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: ed3ea348-145a-4caf-ca01-08dbd11d6afc x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: C8vrW7plKOMQUCNyRW+nkDabKx68cQXGqzL5aV1PmIwORimjHZfN8QvHc9JjmecgH04QIbGeXX4m5ip8c0z8hztN/sV4k3f9CCnnPZrbQleNjVR60Yu/+wHNyYncgZrTIotVH7BxKtLugTbPgiNRrMbvlgHSkR4vO1UtnlOzoum83vd7k02ac1/9Yk/WI4hf4FmzwQhlY9Bwst+FYz9ryLhWghsnYGNGsw6R9pX5Kg7ydUX0+hLi5XPQpTmmnPbcQl+eKtmCnPPCpsYNmgr74w+q23/znadzGQ0D8agElljJ9w0Y6JLr23+46G6u+lwPlBQrJ0nM2YYkLMCgG2XQtV2pGbzILiCJEml0jyrFmj3dUq+Kjep1TLFJyhKpgg4izE8nyHGkB26TpOkqEW5q73rCr6s4VEAqoQEDeO+CDap4cGebdo4p5wOdCC1CkIhcCx4AsFp5YsunU2ZDayipDmbRn0HwvoJoBGSwOdsqMiRbyKvntzr2/ReD6p94g5WovJBfk/uvHBiEMI0Jq3y8SPOKXqH48vVltwHCrjA6DX9RQzhQtE+f9kDo5jUEwJ1GPJAiz515BvRA256Up/ZHSpHZB2OUUQJwTsZ0HteQAFZV0LxFK1pVtKEZPYA5ZlgL 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: tX8lTWdYRxFR1BZmNhE5SAr2uYZ46K17144BAXhv89porJpGkUl/54cgUJn5IrdboYj7/t6uIDaoI4CzNENVCsSBNyMbTqKqMu7epiw0TxVmLHO3yOxN7Z6YH2kN+6MupEV10qCNu1IV9n8iVnzXTLtoxn/2I6F35eETAhQGbgnJ0EX2Q8Oajw8cn0Exg/3qa6C02BK+SDzWKndqJhxIlNkAy5SoXNY37d3hWwT6A45CTZK45AEUsqYABmL+5iimDSeXJNIJQ6Gz1k2w2q7LZioeEMwiGmDNmll+aqylNrPK2cL6zJAwCgKmOotLdCZ1p4jo4qaJPxm/i/iahGTKv7VqMsscIarODEfFwUWnZK8HaOAlukuOdzAa7pS8/CKBemszQi+YAwbPhgeJFxhwGnk9eKmwznVUaCYQ8+bf32GblIQK5jXOAis1A+PFv727vK7wT9iM1W6J03bDmRp57tkNKie4sU79sKfZvP/EGmnBDxAB7XxgtC0RvZqs31up/fIKBRUrcqsKyXZA8bkGTM9MxuvdRljjltc+nBcCXQbdTHeI5E/2SLY74VWxdEUBN5ZNkn75SC0j2VzSQd/UhmzJZqd9OzvdxWPHx3wBn6UryGR5GuJfW9+s0ZJSyMsufhJ4noVEN92n+t2b7DAEqULBgqnSr2ktTDGkzqATFkCRBcAWO7QcSZHnRPyklkA6/gTwwizoipXxt6T3XAMtwRS5nGKr6vZEZ6BY+PV9Wp8aM6jwECzSR/C5jn2AsDbDseezyoLApA7WkU5BcfuYfRqcNH1R1N+Q5m/Qx7W2FcLBc3aHQI+DUtqJxBV/17SNI3Ge9rtzQNSMcpnXRHjraS9+Ana03l/rhnAZu6Tq65qKfpdgk9jJYMtXPbUJwZns+Zg0eBIWL6/kIL76zO1BXEPs/IMN8b7xOkMlrS60xwZ0OE6IENmCBCuOSXT6gD3fhUPIZiWxRjumKYI3nSR1Wg8AeQ/hvVRLLEC63JYVBDkk2dcki/xD1UvneVfnUYXLaFRY3TzWknLuwS5lOj7pVbnKm3DO0eKjAGF4uYwIP6ol3B4rmorIMjZ7wu2mQPRoTCbG3S3aEn1CISwEZYrnitN5Nvixk1vU+e9SbHWB0LlKOqc9wK35s9KA74/ABR/zUalhCs4m7PuYPCeZGuO2sXVfowctP+RUmm6FQxI+HqmZOReIvs2mMcaD9QoPQ8N6LDTmCF0bl5bQcG9Ng1Yyh7kWSXJhnNpFjBoE6RgPzU7zzstl0jfP1iHnoJ9v/Sfw+9SFQIGn1gBQ4FENIQhvTycq5CpA60XWZmtibHDg+cjF7KlX3xhNcqsC2O8SwBTJ94fEgoxI0+T5CPyjRj6YndO4Y+0+MIvWymL6Ah0I/ulwiB3raMtWX6rka4klvC++/wgNoP+7EZrTCxuyAv4r7YhYDJnC02x3Tm3MPn3FQuVLwRUH3x11/gxTfUPsdRebJQuTJoCNc2WdLK3RP0STumGjp97qFcRkEeOycEitcOItKKfrDXZgKjGBXEeKx0x+Vl7+WAOywD2vFnirzkebPf1lFxg2/2YuaUopJl3A415MTNAWSyJG9/c96xlboMwq 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: ed3ea348-145a-4caf-ca01-08dbd11d6afc X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Oct 2023 03:34:08.1760 (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: tWUXxmmXQ6SlYa4KrHx7K3Yx5jBuR5BEurFtfDVhNCzQuOmxSE4LgVbPBxkgI1gk+KTpZ9IwgIT042d+iuMBiA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8236 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org If host mlme is enabled, gropu rekey offload should be disabled. Signed-off-by: David Lin --- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 3 +++ drivers/net/wireless/marvell/mwifiex/main.c | 4 ++++ drivers/net/wireless/marvell/mwifiex/util.c | 7 +++++++ 3 files changed, 14 insertions(+) diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c index 40c39e4765f7..3d59e6a441b9 100644 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c @@ -3657,6 +3657,9 @@ static int mwifiex_set_rekey_data(struct wiphy *wiphy, struct net_device *dev, if (!ISSUPP_FIRMWARE_SUPPLICANT(priv->adapter->fw_cap_info)) return -EOPNOTSUPP; + if (priv->adapter->host_mlme) + return 0; + return mwifiex_send_cmd(priv, HostCmd_CMD_GTK_REKEY_OFFLOAD_CFG, HostCmd_ACT_GEN_SET, 0, data, true); } diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c index d99127dc466e..3bebb6c37604 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.c +++ b/drivers/net/wireless/marvell/mwifiex/main.c @@ -802,6 +802,10 @@ mwifiex_bypass_tx_queue(struct mwifiex_private *priv, "bypass txqueue; eth type %#x, mgmt %d\n", ntohs(eth_hdr->h_proto), mwifiex_is_skb_mgmt_frame(skb)); + if (ntohs(eth_hdr->h_proto) == ETH_P_PAE) + mwifiex_dbg(priv->adapter, MSG, + "key: send EAPOL to %pM\n", + eth_hdr->h_dest); return true; } diff --git a/drivers/net/wireless/marvell/mwifiex/util.c b/drivers/net/wireless/marvell/mwifiex/util.c index 23675c1cecae..ff1b2f162c30 100644 --- a/drivers/net/wireless/marvell/mwifiex/util.c +++ b/drivers/net/wireless/marvell/mwifiex/util.c @@ -482,8 +482,15 @@ mwifiex_process_mgmt_packet(struct mwifiex_private *priv, return 0; if (ieee80211_is_deauth(ieee_hdr->frame_control)) { + mwifiex_dbg(priv->adapter, MSG, + "auth: receive deauth from %pM\n", + ieee_hdr->addr3); priv->auth_flag = 0; priv->auth_alg = 0xFFFF; + } else { + mwifiex_dbg(priv->adapter, MSG, + "assoc: receive disasso from %pM\n", + ieee_hdr->addr3); } }