From nobody Tue Jun 3 23:25:51 2025 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 4bBmzh18CJz5yHrP; Tue, 03 Jun 2025 23:25:52 +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 4bBmzh0PYDz47b3; Tue, 03 Jun 2025 23:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748993152; 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=oC9s3OGG8HpYK3y/YZFz7mXUqa+OxW79DiBYp1+rDDE=; b=sTUULgRrzxkVtOr25ZYy8DwPxD3kRdKyIzlfKZFwCyUBSZlXtQzAtRlCmjp+8HY1Oy2DX9 PhX5skwbjceQndG49NbjDLVqWE/EyP1xuSH2fx0E3it6Fo6l6UE33WkNkgejHIArmGN86r FHNuS5diia2+RxlplXPv5U818e4XtdrhxUu9e+60maEQKluxrFMScoMtS495kDPR7RF1pu oXKk/nFCbnU3BRZLZZQchkYdVvOBkf0tT6hTYy4zYT40l3s6i0TX2GD9SPyEv/JMP+4Gx4 5k4qyJZXBtUZ4Jc0S3uRffmixtvDYlO7XZa8IFfQ/wL6fyNgMOoXEpcpKSe4PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748993152; 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=oC9s3OGG8HpYK3y/YZFz7mXUqa+OxW79DiBYp1+rDDE=; b=LPYG6Xr5oLzk219mgr+WTzGsGdWAnAWDp1gaVqvmf9hRMMPu5l8ZNqzGu/pwnZgWiBNZsw N6FK2DHWaXUnqt+5EDwwSfwsarbgwgrAUNcaW96bQogpm0bOZqLXfYl0ZOjcTBvmiFeEiw TqstgeykjsFj7lvbdPtdai8/d6qfUzp3TOBZLkD+IxvCO9uiLYaOsMIFZ7XCrmDVjkumni KQhsOYarsyw0zGF3zI6b5uKvC/aJGY74qBzSda4xk72ie8YX7B5cUrubpcT093FrFGcBHz beUYh794UkU8ein3LGdf9pBY9Dl3DsBRoMT0AaSQUF1ko0fP1Vetjw2A0wv76Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748993152; a=rsa-sha256; cv=none; b=v/mrHenuKmut8+pz/vGttvZXwYApwgMoi3l2vRfgmt1CVFXALIx1ghx1NZbJfAXKWfELtN wXkpOfYMchEdwj21kxmOUH1puOSdWXkFfkb/g3xNQltVK8ewOuOA6IuOCiNenmmbKn1ccx zEOpG5Gyb7jNMpYP248IS4XMSF5DwI13OWGBdHydZRQJVegBBhZENuUWR1HQ8+UescVVPN kY9VO2UTPZ7fmx6Dx/kJrY+tPqrigz7mxmPQ+VTvlLbtOp9WERQ/+0UnOgWX/aYAxhAS+m pKvf9yF38ALxtJPlv2ZtV35G3FWwUojXI4VVpUMOFp1+/qAjgD/AfoiRjTutCA== 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 4bBmzg6bMFz10Jm; Tue, 03 Jun 2025 23:25:51 +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 553NPpGP043499; Tue, 3 Jun 2025 23:25:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553NPp88043496; Tue, 3 Jun 2025 23:25:51 GMT (envelope-from git) Date: Tue, 3 Jun 2025 23:25:51 GMT Message-Id: <202506032325.553NPp88043496@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: 71f854e5a01a - main - LinuxKPI: 802.11: update HE structures 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 71f854e5a01a347174d09d594b3d490f806cf850 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=71f854e5a01a347174d09d594b3d490f806cf850 commit 71f854e5a01a347174d09d594b3d490f806cf850 Author: Bjoern A. Zeeb AuthorDate: 2025-06-02 15:49:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-03 23:25:39 +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 MFC after: 3 days --- 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 {