From nobody Mon Feb 19 08:07:52 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 4TdZsP00Ffz5B2xL; Mon, 19 Feb 2024 08:07:53 +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 4TdZsN5cV9z4KV6; Mon, 19 Feb 2024 08:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708330072; 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=a8rfzGbR1CZykfhCA5wjJS8yeFLfRfoOKpygPh8CrBw=; b=lWr05bU8zcgSv1zZNoC7+dEoE8HU6jmZ35Eu4WZRO/f921BMzol/6p+HrE2c73t2L1HuqR ZlrozfHBBDkkkyG7ObrJVA9ajcr8DbHMvkOxBgAmmxAz/Wjn5ghmLjZvOuKZjPQMPB1ynv IFHef2JmdbNSbWLH4846qmD8IuDPV2aiHNtY46MdzWXaDiFS5InTQ9D44W4qfTOVYdvRmk 3c8Q7oqwzXFu4QphMw0NPx/LU21gxqwcMZsthtljoXAgkuYduKzMhfQUVGfGLRFsO0YzEJ jn9LD4KZNRqjGyoM0/K/mTN+xAn/jMNcDe0n66eNzj4ak7g3yW1upgKyvsJTzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708330072; 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=a8rfzGbR1CZykfhCA5wjJS8yeFLfRfoOKpygPh8CrBw=; b=pmBGlVoFiZIg4P6FcdQ5+sE2G8YOLENJ88KD4NdkPNKPe4BV4hKglz0FK88ogUphNibeEq 9Huk9WG9TP/t54NqhGmUbbGmc0oDh8aM6YDruUtNiVjzo+g7G/bGysyzq7QrJ4k28Of/Fb f/jBiBhmCtUJw5bz8yi3PbMGa8Zb0WkV0C4VrPe+P+4nHeyWOLimRzKlSi9eqwU9831km5 wC8Dn0gH2tTvnr2H2XxW39oQ1QkLJZUfgztf0KbYA3p77oWmYbHNSq6I6LaZSUDBsWeWwa yBmuEM0FgiysCRKuIsXwNNvc1VgBlc4qKNJiBgu1IX9R4cVJfo7ftUElxh9RKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708330072; a=rsa-sha256; cv=none; b=qyUkdiXJnQ2oyLBw7XJsDVbLjjFWW7Uhv9taXJNPFAQmyjup9S0yzd8b9skJwakWV43a5W E69VcAiY94mlaQLVB1UgeSXlMvr3Fdk8xekn2mtzBu36JpLzlm5ltwF7JkxlbPcLaOIj6C dh/nBe2Ghfh323MFSyWc+sspUgAgIWsltD1CVVNkqtKq0JyDRhmrmre7YASvn3sBbD06+2 S3Sla96NMNrAid89L6yVzKHkEdxf/wpYTIfm2q34hTDAsWMQHZSc0RRHWpfiUqbnSnZQQ9 d422CW6+zT9/dBfVtSSj5yDnHUc/YyVMEgqplv4hvOnah6kciuRf7GZ2uAgpgg== 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 4TdZsN4hTgzR5K; Mon, 19 Feb 2024 08:07:52 +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 41J87qRZ015978; Mon, 19 Feb 2024 08:07:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41J87qBo015975; Mon, 19 Feb 2024 08:07:52 GMT (envelope-from git) Date: Mon, 19 Feb 2024 08:07:52 GMT Message-Id: <202402190807.41J87qBo015975@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: b42f8328250a - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: b42f8328250ad257cb43a9407245f22b1e2936cc Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b42f8328250ad257cb43a9407245f22b1e2936cc commit b42f8328250ad257cb43a9407245f22b1e2936cc Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 14:21:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-19 08:02:00 +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;