From nobody Sat Feb 15 15:51:15 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 4YwD100vDnz5njxj; Sat, 15 Feb 2025 15:51:16 +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 4YwD100B6lz3H41; Sat, 15 Feb 2025 15:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739634676; 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=cKXkpbdxNuAE7YZHS9tfPNvyR4j6Qp963ygXAvsvviA=; b=fnieGhOLEXywOZPXPDPbGQ0/0trY9NUYwDphDNLZnnpxPCUo7Cvs6+syWCeSKpcjC0gnT9 njqYZjyCuju2ECuLvrs0s7lEUy8MlNJXTkJ5mJR6wbDszy6WfjzhkGPvDr9p3aMuOBAhF8 g5tlHwPQWw1GxLI0mFFGf5HYqUoWHOaa4wNKrMQ8W+mmtm7UJah7BS8RL4xQce44SBY8CX 2KfWI6MGPraDH3Yk5dt2loacNwi+DdR/lNxlGjvfpraX+Vr/Bk+0sosEnCpveMLhKdCeEa xNLur43h6yJSHqjWxRXdqYLUIArIbrXSqL5jXKaqZwxSco/swyveT+NruzEK5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739634676; a=rsa-sha256; cv=none; b=EJWQdQ68wY/SBzW/PeL//lQdX2u2AihVtjmbi7DDU1XRNt2MBBtDrMiNcRHrewKus2eBt3 xs2Rs+p17hJOJKXOiXjd+z5zaxb9Zpk5bafRiI1LLsD7hok3WeqDu2cg/iY8BPuL7SbcwE 9pjqHlkfW+Xo1eGqzx8kOoCxQ5bc9QkTiJwVWjWxoCB1N6+B6KBbzCXkr74VuA6IxDwGBY N17mNgu9/3tebQ77wuhyZQNahLd3gBDk3U8j9mU8QA+5KdUVO+jPGaFpoZlB/nXx2hT12J h2QFMGBCspM+bqy/vf1f5hG+SnthtNyH5xh9ZDG9Cc4CF6oNabCUF5IpJ82Kkw== 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=1739634676; 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=cKXkpbdxNuAE7YZHS9tfPNvyR4j6Qp963ygXAvsvviA=; b=sxC41xY3JYa4Hc76aFDHYxX5rsz/Ddn32/I6ofsjC4NWKPTy+zlsDOFunt9o8SsUoR9V+g epqndh9XEIw+Q2e8Up3Z/4wMjcZ8fD4XZ19gqyqCg8vOt9Lpazi7IVsxAGha1CIBmfVkDj cRHy18MxJKLuxENCwbBzllcwtHyauQ/YOAZ9CKDDVeNbHrvR8mIHbHU7P9nZf/qgZYjj2f xBjU7bbQt7UpQFGRD3GC5ReYuUUwqUj+4XjQFhjvD76iiAGa8T4uSWDSF38lah8b1rz6fQ jZuaN+BnAf11ifJPMtVoQuc1tH7eEOSLVVUuPpTMXq1sE7svhoKgfkX/Cy2+VQ== 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 4YwD0z64KMz1MHC; Sat, 15 Feb 2025 15:51: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 51FFpFIr050279; Sat, 15 Feb 2025 15:51:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51FFpFRv050276; Sat, 15 Feb 2025 15:51:15 GMT (envelope-from git) Date: Sat, 15 Feb 2025 15:51:15 GMT Message-Id: <202502151551.51FFpFRv050276@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: 75fb66d8241d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 75fb66d8241d0487baf482c975c1de3b55d9a315 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=75fb66d8241d0487baf482c975c1de3b55d9a315 commit 75fb66d8241d0487baf482c975c1de3b55d9a315 Author: Bjoern A. Zeeb AuthorDate: 2025-02-15 12:40:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-15 15:48:36 +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 MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48975 --- 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 b0bb02450190..6003a1ae0e99 100644 --- a/sys/net80211/ieee80211.h +++ b/sys/net80211/ieee80211.h @@ -1045,6 +1045,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 */