From nobody Mon Feb 24 20:27:02 2025 X-Original-To: dev-commits-src-all@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 4Z1sj36qNxz5ppr3; Mon, 24 Feb 2025 20:27:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z1sj337SBz3nkg; Mon, 24 Feb 2025 20:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740428823; 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=fA+AI6Nbn9L89uoetMEn2xwBwfQFpggCnI1VnWAXOhY=; b=NusfFURpXM7AxGEYh0EmQwOoh1/8Fec8lLsDpalotTOaUjQ2IA423B59GBPLHqlHORwl8d IgEkZdE7xC37mc1UougOZH8dbWVUHC8h3eiYYItbCbOh1+v9SNF//OcTOh81X9LJAP+pPu KCgRsjN9qqen5FgqTrnt6mFb60EQ3wyXaOpQ0RRE0LnnBQMnQzhU8KJhWTjpWawI/EJDYf v+zy+PrU+CWY6TcqFUtNyN2gmmeb7iawTydp9PBVrt+fqvV05PovHp/KbjcJPPCAcDbbaX vceQW4q09CcqppfHSUBXqlocFAnOIJpXBH3zosgkhgQepEtzZ8V5iJTd0zD9Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740428823; a=rsa-sha256; cv=none; b=pZhXiQ9XTQOEtQsVFHrD7yH+Z4rY+TKSpP55rh7z4ispbxQkl06VFHf89JXJnKFWY7eMjQ Wsvfr5OuJ6A6iggvgB0uGp5TsdE5rpUHLEoi95DlYiw1SYks/FUcWkyAO105ZjiWPDkfu9 qjdFSUMaPDSq8tUw+M8Ot0DG1EgRqSCtazryyrpdyCG2JuKwWFczq3WeT+0J991kDTk83l dAfAm4PdMAcK6l8SPGzNw1fy4jzYxQDNJaQH/7xb7HJZNObiwLNl/LBD37FiJ7+R7yBXxM 7R1FrItU4UTqVUwvQn24KJ66nAENMw/o8OoxJUzgOF142qoyAnJtRd+gofzu6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740428823; 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=fA+AI6Nbn9L89uoetMEn2xwBwfQFpggCnI1VnWAXOhY=; b=xlv7TK+F+J/kOuCjCeOfoRlqKY42bgzag3LSUQf4SK7hUxdgqHA4TK2GcOVp5C2sqoa2cY 8ZVq1n1NCxwIeats+Lb76z8kwTLBGmY/Cp99eaBOkTyvSUSNkq4hKy4AmYBTbBRE754G3K /i+N9+uGyD54KU9igCVjcVFPdu9RAxR4lB9RcEcUISTloI4LnLd4AUcMGDpjQWz6VOb5Mi TvNaCbYfqGHT3+s+Uq2mMSINW80rv1p+wTmRQU6VHYjjEP+y/YNNcBCE5zERPctcIcpTiU aDKF/8eABvUBWOzGZYQvOmilOoeNuc5xJRbtmaRa54yttg4C/X7v2Lgc9UUn8w== 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 4Z1sj30lh6zwYN; Mon, 24 Feb 2025 20:27:03 +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 51OKR2xQ027012; Mon, 24 Feb 2025 20:27:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51OKR2Nj027009; Mon, 24 Feb 2025 20:27:02 GMT (envelope-from git) Date: Mon, 24 Feb 2025 20:27:02 GMT Message-Id: <202502242027.51OKR2Nj027009@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: b3c037c2bcad - stable/14 - net80211 / LinuxKPI 802.11: add 802.11-2016 VHT Extended NSS BW defines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: b3c037c2bcad385b372539875e57fdd2f7215e3d Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b3c037c2bcad385b372539875e57fdd2f7215e3d commit b3c037c2bcad385b372539875e57fdd2f7215e3d Author: Bjoern A. Zeeb AuthorDate: 2025-02-15 12:40:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-24 20:26:47 +0000 net80211 / LinuxKPI 802.11: add 802.11-2016 VHT Extended NSS BW defines Add the mask and shift for the VHT Extended NSS BW Support field. Document them in net80211 and further related bitmasks in LinuxKPI. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48975 (cherry picked from commit 75fb66d8241d0487baf482c975c1de3b55d9a315) --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 3 ++- sys/compat/linuxkpi/common/include/net/cfg80211.h | 3 ++- sys/net80211/ieee80211.h | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 58ebbcfe0097..0169e12b1804 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -115,7 +115,8 @@ enum ieee80211_rate_control_changed_flags { #define IEEE80211_TKIP_ICV_LEN 4 #define IEEE80211_TKIP_IV_LEN 8 /* WEP + KID + EXT */ -#define IEEE80211_VHT_EXT_NSS_BW_CAPABLE (1 << 13) /* assigned to tx_highest */ +/* 802.11-2016, 9.4.2.158.3 Supported VHT-MCS and NSS Set field. */ +#define IEEE80211_VHT_EXT_NSS_BW_CAPABLE (1 << 13) /* part of tx_highest */ #define IEEE80211_VHT_MAX_AMPDU_1024K 7 /* 9.4.2.56.3 A-MPDU Parameters field, Table 9-163 */ diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 0b6a66033536..ee16449ecd1c 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -236,7 +236,8 @@ struct ieee80211_sta_ht_cap { #define IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK \ (7 << IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT) /* IEEE80211_VHTCAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK */ -#define IEEE80211_VHT_CAP_EXT_NSS_BW_MASK 0xc0000000 +#define IEEE80211_VHT_CAP_EXT_NSS_BW_MASK IEEE80211_VHTCAP_EXT_NSS_BW +#define IEEE80211_VHT_CAP_EXT_NSS_BW_SHIFT IEEE80211_VHTCAP_EXT_NSS_BW_S struct ieee80211_sta_vht_cap { /* TODO FIXME */ diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h index af411016a170..814221430f7f 100644 --- a/sys/net80211/ieee80211.h +++ b/sys/net80211/ieee80211.h @@ -970,6 +970,10 @@ struct ieee80211_vht_operation { #define IEEE80211_VHTCAP_TX_ANTENNA_PATTERN 0x20000000 #define IEEE80211_VHTCAP_TX_ANTENNA_PATTERN_S 29 +/* 802.11-2016, 9.4.2.158.2 VHT Capabilities Information field. */ +#define IEEE80211_VHTCAP_EXT_NSS_BW 0xc0000000 +#define IEEE80211_VHTCAP_EXT_NSS_BW_S 30 + /* * XXX TODO: add the rest of the bits */