From nobody Sun Feb 18 21:11:23 2024 X-Original-To: dev-commits-src-branches@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 4TdJHw2Fkmz5BmKq; Sun, 18 Feb 2024 21:11:24 +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 4TdJHw0m0yz42dL; Sun, 18 Feb 2024 21:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290684; 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=PjI9F0YMRosVoXYnCA5r1wXLRDdVdNyBX3skoK8X0vA=; b=guRQmvAZY0IXoODsIiw7kv1b7kOx7GyiGNj3n/ld1CArTZ3sGVDVxLMPFiVwzNsP2s+7bm mwsNHcNxLCbr7DsEBRST2SpuxUuwB3GhKtVA22raaKx2BUcX0AhFmzcFoPPYVhfRXuT4re PaO/tQZh6V20VUy89Aut8iDPeRQPfEAH1zULDTzC5cnIiZWdVlu9qgeQXX0T9fPg2OWdZQ J8keyQwecTPY511oFHbJ30f84HUtCdG4vhRjrGawZ57yyoi/osfDF+BhbK5uBuvhDK0GBN CWiFrIoJaiuL8Sn1yj8J0mjmHTQ/9p/H2uL9LqWCjVkEs02NP3czsjRQ/UnHzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290684; 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=PjI9F0YMRosVoXYnCA5r1wXLRDdVdNyBX3skoK8X0vA=; b=hhlup9ThTD/WgXcTshrQvjpM1IzVXhw682E8Q3kTaTBfBYRVnrm7RCnBO6Ff40Zda6Q39T bD3i+tnOjqEaC6ezMqz1I31nc+/yG2kGtjkcYmBmv6w9qLk8aY5Dbd2t9NDJgYEOd9UZjd mgrBRAmlhvfMbm+uPIpPFg4H5T4n21GPQI4/h31aSD5DByGORxx3/6GzYUks7VssYYJiuN 5+1ah+HAKMwzwYYrfr5sl1sbzSwM1fftaWTEr5bEfn/GpyoNLN+PcQbBrioLBjnEdSMpZs HSXGd80c48STHYZliKCzhPoH2F5QThMQG/7x7an1t/oKWyKRyXk0+dEij6PdmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708290684; a=rsa-sha256; cv=none; b=S0DKTCdQleenkfVA8R4upjqxPMaWAFjjJa+WlJLNIFcU4Ljjvg9RC2QoT0KwqbjH7uczJM /W2L03HRqs3aSdaIlkI/0QaBT+H5+YOvF44HGYs0EViEzHguF8kTaN9kWjZJM19fg5isL4 OPV4lZpNLKzsJ8Wxb5+amM1ulXors5p9XPU55a/9SSCxHeuIgHIyAE6AqGO3RAN2Y/9NmU rzBX4VVXeeSgAmIRtQNfi7oynPjry1SsPFWiVDKm3MLFG/G1oGxIazirAMCr3ti8+6bvyt O9dbzne6V/RKLcuGQrgIuksYurrPH6M7Wt5VDnb8lYrbQ28874B2N82tMDZ5eA== 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 4TdJHv6zwCz16WP; Sun, 18 Feb 2024 21:11:23 +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 41ILBNEb015726; Sun, 18 Feb 2024 21:11:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41ILBNR9015723; Sun, 18 Feb 2024 21:11:23 GMT (envelope-from git) Date: Sun, 18 Feb 2024 21:11:23 GMT Message-Id: <202402182111.41ILBNR9015723@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3e0a31384c92 - stable/14 - LinuxKPI: 802.11: extend ieee80211_key_seq and WLAN_KEY_LEN_* defines List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 3e0a31384c923f636b39ddfb64e09ce4e057b716 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3e0a31384c923f636b39ddfb64e09ce4e057b716 commit 3e0a31384c923f636b39ddfb64e09ce4e057b716 Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 14:21:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-18 18:31:15 +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. Reviewed by: cc, emaste Differential Revision: https://reviews.freebsd.org/D43646 (cherry picked from commit 2f029bf911e29dc46c32ea142daba4f26a2078f4) --- 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;