From nobody Sat Feb 03 13:32:47 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRtqh20f9z59PKc; Sat, 3 Feb 2024 13:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRtqh127Vz41xP; Sat, 3 Feb 2024 13:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706967168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KPYwl+F68WJPwkJQ+v4PxDSGd9wWm/yNngXS70cvHF0=; b=v/gNASGHFyl8m2pdnrOQ1rL8zYUgZl244+7UraLzCJjYG/6G6j5KfUie8UyF9OCaphf0XP ywh6UzVA2dmN03RF3Bvyo3HdvDzF8v8DbM5RcbhZ7DWqz0EcbUYq35WwEaIq///UJDDCFu 09ItGOOhWBMtvWgAwwOSDwUF0+cU/NfLQ3IVKv6dAIjD25ULTceNVnH1Crbgkag8QrbUPU 2zT/HP48SaoKoaLYBv+t16MT4iQdf+hDR5D0Q2VphGKEouqGnUpKw4UgJOHG1NN46aE+4i nj66ej/cQXHIW70BOp68HPCWJDq72SK1JwAt6ejzzUlL32n4Ppxrezjip2NzpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706967168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KPYwl+F68WJPwkJQ+v4PxDSGd9wWm/yNngXS70cvHF0=; b=gT5CmBdlFJDwToFJ1Y3TG4sRVUAj1RrFtmdONX/uCF881lZHLGK2keaX6jTQ52+6KmZff1 7DKOC5gwggEQUcjxdQ29/Xi7zeOmKju9RBbcxG2v/ZnKSHTbLvIqYwpBarG+epLnZyckpZ lly+CaflwmuNfHZYQ3qAHE+NudXkXGGj6wjsrEvatZZLU/yCBea8sQiUzZDwCqkWRtkKVd elXUeejFeHMHdRkmtV6SxtwOMh5roZQKn01nF4nKUAzOFIVUfYSp6d4BTlVNXMSTPlH8OR AEyDbPfxyYFB7kCRt9bcccu1bst8Cz5kDwPA9QnoBmiHiSIu9Cx8fznY4IZ/0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706967168; a=rsa-sha256; cv=none; b=g2rVqpxGkQchJcB8zhgy1fZQ4887b30dAxWxUBIPIsSJKDdwRmRLT3HOo7Rz+j143EjsrG VW68EV7DAwf3oMtBNJAj3yQQIXo8aygRMJKOPQlzE30LEX88ndB+3v+x4PyFp4fEMz63j4 tarO0VemUuWE0XMcNqtKovQyFsB4n/2QJ0Dhaq6A6rQ6RoTMXI+Ho42UIDAeLTIqe44AeY 0DXwFn9sPU8rixc6KZsOrNcLUgGWB7Y9eCWipT095EncxUe33Lxyw4Cysr0vwCMcknpMML ioNJR5peGIfDAyBxCe3iMB4alod4Ir/IHEs7FZo4KPwnaEJCVlyOlXuto095eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRtqh04mXzFkB; Sat, 3 Feb 2024 13:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 413DWlIj022652; Sat, 3 Feb 2024 13:32:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413DWl0A022649; Sat, 3 Feb 2024 13:32:47 GMT (envelope-from git) Date: Sat, 3 Feb 2024 13:32:47 GMT Message-Id: <202402031332.413DWl0A022649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 2f029bf911e2 - main - LinuxKPI: 802.11: extend ieee80211_key_seq and WLAN_KEY_LEN_* defines List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f029bf911e29dc46c32ea142daba4f26a2078f4 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2f029bf911e29dc46c32ea142daba4f26a2078f4 commit 2f029bf911e29dc46c32ea142daba4f26a2078f4 Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 14:21:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-03 13:31:50 +0000 LinuxKPI: 802.11: extend ieee80211_key_seq and WLAN_KEY_LEN_* defines For iwlwifi(4) d3.c we need another struct in struct ieee80211_key_seq and related WLAN_KEY_LEN_* defines in. MFC after: 3 days Reviewed by: cc, emaste Differential Revision: https://reviews.freebsd.org/D43646 --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 4 ++++ sys/compat/linuxkpi/common/include/net/mac80211.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 5c18bb9fe3d9..09487a318811 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -133,7 +133,11 @@ enum wlan_ht_cap_sm_ps { #define WLAN_KEY_LEN_TKIP 32 #define WLAN_KEY_LEN_CCMP 16 #define WLAN_KEY_LEN_GCMP 16 +#define WLAN_KEY_LEN_AES_CMAC 16 #define WLAN_KEY_LEN_GCMP_256 32 +#define WLAN_KEY_LEN_BIP_CMAC_256 32 +#define WLAN_KEY_LEN_BIP_GMAC_128 16 +#define WLAN_KEY_LEN_BIP_GMAC_256 32 /* 802.11-2020, 9.4.2.55.3, Table 9-185 Subfields of the A-MPDU Parameters field */ enum ieee80211_min_mpdu_start_spacing { diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 293b6868cd50..fc9d7829dae3 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -528,6 +528,9 @@ struct ieee80211_key_seq { struct { uint8_t pn[IEEE80211_CCMP_PN_LEN]; } aes_cmac; + struct { + uint8_t pn[IEEE80211_CCMP_PN_LEN]; + } aes_gmac; struct { uint32_t iv32; uint16_t iv16;