From nobody Thu Nov 30 00:38:21 2023 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 4Sgck56bgRz52V2P; Thu, 30 Nov 2023 00:38:21 +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 4Sgck5523Jz3My5; Thu, 30 Nov 2023 00:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304701; 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=zANzdE8U3ZfAQ3Okx8SVShgkyXKGGYD5Di6yo58VGJQ=; b=Ku4/AcPs1ZeYH6HYiA5r8jb2m7iPaKqc3YbaTCubZBoV7Ytr/u+/DsPQBfY59i6EYUAF3j f1qng3TBHBY3zbNkJyczQ8zSXqPo52RehXzdO1r7Ums9qBuednL1q4FGrtZj8m7LvJFn1l xuKSGjEMKaCuBs/nuSTPSnm6gy2frVrDBGkxtMRilAxulpV2WIuit8UIK0PmIOdgiAnRzU 18nqfIHCwihDXHClHd14JiwyIQvWoFj+wVtgBrdB1H8SbIXd16MB8jYRqsT4bBuxSXDtWT bBIOpyyFb/nAGgtbtjwsJ8oAPsnTk6yk5o5IQy6yePrmkUNGLMOjHI0W1K8Tcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304701; 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=zANzdE8U3ZfAQ3Okx8SVShgkyXKGGYD5Di6yo58VGJQ=; b=PiqcL348hexrOklasgwy237+BvIBx7GiKp1fu306rmnM15gctlkUKUwq1FLwGKX5YUM2s+ 8g01RUO6PsJ1Qszp3JRZhXv3mUAG5lG3G3ZKMmFGMcstAdeHruUAMbUFjdZ21x3O9iLli7 v8WMXouygb6Ekn/Nzgz5Yb8R640SU/Nht0Ei/F3jUHR8BKFLt8+BgqVT0gYtlGwLinmn3v Ue/j52ni0z4jkiCNjen1k43F0gifsK5RZSXzCtLebxbpBqr0ldqXZwc6sJcm3cCLvtaTot wkFLkBtkkgaPodg/WOqqw8wyUQeIjm45J/9pkFxD1nQVNH5LRhEEREdvhjWCSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304701; a=rsa-sha256; cv=none; b=jGMskLB+roNRIqbqBZzeuezoJAM229Ca5i4msYqPxstZwzxrbSmFvVO1ij+W08Hoffrz/l uefSNl/H8oVgM0jofpr1Zb/DTB3bKdz4fcSAzNh6EMUYhp1821DdgKvEqjW0HQRHKTk9Pl 4lCUdbqvBGhG6C6uCzkTVHrjYU+rs/DtgB2VTPhS0UqmVlQ3iCdc4VCkVQbDIvEY5ns6z8 nUhSBMvp//vkZvABsyUkJm8wKdCxZdmX8F5+xe73fp0iwT49358NBxkhptaQEQJnbFgNHu Urjz8KudbEKYXmLISxijYQkvpLWdLjhF4bIW/+JI3nLPXM8Zw4HXwPc4bKcX5g== 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 4Sgck53fc3zD8r; Thu, 30 Nov 2023 00:38:21 +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 3AU0cLvv052169; Thu, 30 Nov 2023 00:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cLcl052166; Thu, 30 Nov 2023 00:38:21 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:21 GMT Message-Id: <202311300038.3AU0cLcl052166@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: bd10aa138e78 - stable/14 - net80211: add ieee80211_add_vhtcap_ch() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: bd10aa138e78b621ee82288bc11d7543c33a9a35 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bd10aa138e78b621ee82288bc11d7543c33a9a35 commit bd10aa138e78b621ee82288bc11d7543c33a9a35 Author: Bjoern A. Zeeb AuthorDate: 2023-10-26 20:55:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:58 +0000 net80211: add ieee80211_add_vhtcap_ch() Add an implementation of ieee80211_add_vhtcap() which works based on information derived from the vap (and possibly channel/band but we do not support that yet in net80211). This is needed for scans request information in LinuxKPI at times before we have a BSS. Sponsored by: The FreeBSD Foundation Reviewed by: adrian, cc Differential Revision: https://reviews.freebsd.org/D42422 (cherry picked from commit 6c3ae01cc75afdd575f54289b2879a7c98d55bf6) --- sys/net80211/ieee80211_vht.c | 27 +++++++++++++++++++++++++++ sys/net80211/ieee80211_vht.h | 2 ++ 2 files changed, 29 insertions(+) diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index 77611d9704a2..f7a13157150e 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -707,6 +707,33 @@ ieee80211_add_vhtcap(uint8_t *frm, struct ieee80211_node *ni) return (frm); } +/* + * Non-associated probe requests. Add VHT capabilities based on + * the current channel configuration. No BSS yet. + */ +uint8_t * +ieee80211_add_vhtcap_ch(uint8_t *frm, struct ieee80211vap *vap, + struct ieee80211_channel *c) +{ + struct ieee80211_vht_cap *vhtcap; + + memset(frm, 0, 2 + sizeof(*vhtcap)); + frm[0] = IEEE80211_ELEMID_VHT_CAP; + frm[1] = sizeof(*vhtcap); + frm += 2; + + /* 32-bit VHT capability */ + ADDWORD(frm, vap->iv_vht_cap.vht_cap_info); + + /* supp_mcs */ + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.rx_mcs_map); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.rx_highest); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.tx_mcs_map); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.tx_highest); + + return (frm); +} + static uint8_t ieee80211_vht_get_chwidth_ie(struct ieee80211_channel *c) { diff --git a/sys/net80211/ieee80211_vht.h b/sys/net80211/ieee80211_vht.h index a3830ae13ba7..756c2e367485 100644 --- a/sys/net80211/ieee80211_vht.h +++ b/sys/net80211/ieee80211_vht.h @@ -50,6 +50,8 @@ void ieee80211_vht_node_leave(struct ieee80211_node *ni); uint8_t * ieee80211_add_vhtcap(uint8_t *frm, struct ieee80211_node *); uint8_t * ieee80211_add_vhtinfo(uint8_t *frm, struct ieee80211_node *); +uint8_t *ieee80211_add_vhtcap_ch(uint8_t *, struct ieee80211vap *, + struct ieee80211_channel *); void ieee80211_vht_update_cap(struct ieee80211_node *, const uint8_t *, const uint8_t *);