From nobody Wed Nov 29 16:38:55 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 4SgQ4w0phSz52x1h; Wed, 29 Nov 2023 16:38:56 +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 4SgQ4v6XMPz3Kyg; Wed, 29 Nov 2023 16:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275935; 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=sY85u63/vlsF8ffPiFJV90lUwre0dZL361nQzDK3910=; b=QdqJUIjn9fF9XnsrTjUwJpxzIXIaDq82TR6rTft7otm7HnYqWkG3WIFh6kw74QZJLm0x5J 04loAZAUovFCVCLg/My1QEAcdjgMkwpJb5b8cVUPHIdoe5Jr8r3i9W0rdFQXVBHDf83dlE 2mE78evgO2bjBqSO/ZjfOnmJezTNcLOz+o4/qbPPhmR5awdagG8qElwJO1zaw7o/eEPwam GpVipDGSSXW+rCw6M33B01WaGlUzIzcSLrH6QFkmAM4AQnTzXELU4Mf+yOF1l5ZJaHilYw MHl6FPkgQzBK5FVVUY7gJHbQhKuHus4pGpJRQfnx+3UjIDadpfqQBgj/mGHTAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275935; 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=sY85u63/vlsF8ffPiFJV90lUwre0dZL361nQzDK3910=; b=V4iaBymT8XawAi3do47KyCHEC9e00CWAteE417AvA1Gyp+Cct/ixenCvqLSK7O/jUPi8wG icKi+Nkkq9bxx9E7+DZv3wH+SFD6EFOgl2w4GJwu7xDD2VEGEix7229kmYsIUlg+qu2bSM K5vhQVhu1H2Bz35lCdTggu8uASY7fIgWeF+LN0if+8ZKl/nA5gu+6FerJL6yVRf3Y54dhv E8rRbtIqkiBo4Zlit557miESCUdHlGC9b+xq+ZpvW/jQR0KrUoJkvBJZwWeIpDYI7OlIvP Kv9iPC7KlyahPh0/YUcQ6o/YvsnfuaZtx+S+I8tTe4Yt0yfXSoiepDOlw2pmvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275935; a=rsa-sha256; cv=none; b=B3Vzv1nvFrTyuncyUhUPlaJ5RyeW8TAOM68044tOtxII5UQmhjWzD2dgOdvu4JDgMMyH10 w8AjFZlEYwWnC7OHB5b8xzbRfIpnnL9/zg3ZxaYt6bI7fy59K8FQbTxSJs5LkpfOsnJNLT alSerixFgne6YUJdYSed4bqgh8CcwvQKbod3GCGUMOyf4wha4HaYk7wRbPfUsnYvTAEJOp OU6GQ5c6Tml/rsdEupx/4bNcIuGHdViRDWYHKEQG/9EzgvXarKtXTQLrBuvhW/kUbApymY SReHByv6Rf0UcrtZhD1tn5zQ8NddAueJ3OSq0gYbxyrg0Om5ShkeLOn/W31w1Q== 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 4SgQ4v5dJgz1C4G; Wed, 29 Nov 2023 16:38:55 +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 3ATGctSC047132; Wed, 29 Nov 2023 16:38:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGct60047128; Wed, 29 Nov 2023 16:38:55 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:55 GMT Message-Id: <202311291638.3ATGct60047128@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: 73d3c2546007 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 73d3c2546007e54fb74cf08e61094a683b89d81d Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=73d3c2546007e54fb74cf08e61094a683b89d81d commit 73d3c2546007e54fb74cf08e61094a683b89d81d Author: Bjoern A. Zeeb AuthorDate: 2023-10-26 20:55:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:11 +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 (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 *);