From nobody Wed Jun 11 09:14:14 2025 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 4bHKjM50TSz600FL; Wed, 11 Jun 2025 09:14:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bHKjM0zsgz3lYl; Wed, 11 Jun 2025 09:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633255; 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=SXoiTRDTp4CrGBOmhEBiq54M2J4VGRweQ44Rh0fWPVA=; b=vvuMwzdBVOh6f5k/vJrqj+68j2eh5LvxvK84cBDXDEsOY7YXvkheG5wav67Q6yBhripIbF MJw4VIhluqAVfIRwCtr+TS20Y66bDzbvu4r+wP1P10GfgMWI3mNOE+wkZE8z7X2+mlnRLD LwsxhAmdO39z3jJWUZ1jpouwVxLJeqLcgbskneXp9QmdY3ajs+tdrWxkEp0y9FagA5T2f5 rk4cCrHS3XsqZmnXzqR6bDY8Ya3f4nThYWPuwrf45vCtthNcsLiMnupUuUZPzRh9BZrJKG SwNJKmxSQtlMpIdzm3w5Tzux2YBIu+8f71v4LJLcmFtIlD+9dD8mg3mm2t5bOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633255; 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=SXoiTRDTp4CrGBOmhEBiq54M2J4VGRweQ44Rh0fWPVA=; b=Pgi2+mvZ8mDm9xO+V73HOUjIVASBn2IWY14nWebVA4RM73wdIXGhHnz2oyfCVimcuNswEy 13z7y2T7bsmhUGJW3mw5tt1EaZQMNRje1iBnUBCi+owq4r+pj0qMlT/Wt0YDhp3zJm8i0I Z2xgrFHR/MZmgZT0MAHiuw5HxKda6o/C+ZEU3yJyphiowa0+ZJFeuc/pNj0yt7y16/QCvM a2SJztkZG2ioPi+8nugJ9sa5M91IzRoij302x2j7r21Tw5fU4FeHDbuwLIy6s9GxUGU4wx CB1xGIyxuC9kT3kZ4d481p0LUi4lzfUeo8oTzB/LRaz/Ygf0nINdjjZ0sYjz7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749633255; a=rsa-sha256; cv=none; b=A1E/o/DbR2M4RfIvUwj5gdk7lINgMOxnSE6nt8ea5+mz9ywCacFeLfGGETe+HN6VFAxJxY XkGnw+1W0/l1BgWe005vlCIptaUrFQQYscbshTPeN90TJ+2jgEFwjZOk+MiIplQX3/AJjQ 3la8kKBWnIGuEroxDBT5+0mQXs6rjsq0vniHWDveJb5yAJy7xuAPl0V9nC4coKpkTgYmX+ 1FvZumTH5PUSrDYRrPsn4UT6wIR/HP8hb1nH464Jo8UK66KlZdy13WNtmJE3vtf4t6CkDH +G886FDbTm/KRYETNcPkfa6Za4hoccM8hCMRdQtg/pIO24P10O7ZxzGPg2i+SA== 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 4bHKjM0bnrz5bS; Wed, 11 Jun 2025 09:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55B9EE1H061942; Wed, 11 Jun 2025 09:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55B9EEBN061939; Wed, 11 Jun 2025 09:14:14 GMT (envelope-from git) Date: Wed, 11 Jun 2025 09:14:14 GMT Message-Id: <202506110914.55B9EEBN061939@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: 2888dc2e5d78 - stable/14 - LinuxKPI: 802.11: update HE structures 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 2888dc2e5d781de3ea17f4598e247ab0673096da Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2888dc2e5d781de3ea17f4598e247ab0673096da commit 2888dc2e5d781de3ea17f4598e247ab0673096da Author: Bjoern A. Zeeb AuthorDate: 2025-06-02 15:49:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-10 23:38:13 +0000 LinuxKPI: 802.11: update HE structures Update strutures needed for 11ax (HE) to be correct. Add references to the standard. Sponsored by: The FreeBSD Foundation (cherry picked from commit 71f854e5a01a347174d09d594b3d490f806cf850) --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 28 ++++++++++++++--------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 7849c77062dc..e9af70f751d4 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -895,28 +895,34 @@ struct linuxkpi_ieee80211_regdomain { #define VENDOR_CMD_RAW_DATA (void *)(uintptr_t)(-ENOENT) +/* + * 802.11ax-2021, + * 9.4.2.248.2 HE MAC Capabilities Information field. + * 9.4.2.248.3 HE PHY Capabilities Information field. + */ struct ieee80211_he_cap_elem { u8 mac_cap_info[6]; u8 phy_cap_info[11]; } __packed; +/* 802.11ax-2021, 9.4.2.248.4 Supported HE-MCS And NSS Set field. */ struct ieee80211_he_mcs_nss_supp { - /* TODO FIXME */ - uint32_t rx_mcs_80; - uint32_t tx_mcs_80; - uint32_t rx_mcs_160; - uint32_t tx_mcs_160; - uint32_t rx_mcs_80p80; - uint32_t tx_mcs_80p80; + uint16_t rx_mcs_80; + uint16_t tx_mcs_80; + uint16_t rx_mcs_160; + uint16_t tx_mcs_160; + uint16_t rx_mcs_80p80; + uint16_t tx_mcs_80p80; }; -#define IEEE80211_STA_HE_CAP_PPE_THRES_MAX 32 +#define IEEE80211_HE_CAP_PPE_THRES_MAX 25 + +/* net80211::ic_ieee80211_he_cap */ struct ieee80211_sta_he_cap { - /* TODO FIXME */ - int has_he; + bool has_he; struct ieee80211_he_cap_elem he_cap_elem; struct ieee80211_he_mcs_nss_supp he_mcs_nss_supp; - uint8_t ppe_thres[IEEE80211_STA_HE_CAP_PPE_THRES_MAX]; + uint8_t ppe_thres[IEEE80211_HE_CAP_PPE_THRES_MAX]; }; struct cfg80211_he_bss_color {