From nobody Wed Feb 26 19:31:50 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 4Z34NR48DFz5nl7y; Wed, 26 Feb 2025 19:31:51 +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 4Z34NQ4ylBz3dcb; Wed, 26 Feb 2025 19:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740598310; 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=nR0qHLnlv2AMDMcNRRYoAa3FwVQUTgoHLOBwsr3kV7w=; b=fe88+aeGakSqN1oIoW0wMV8zmzSDf3U/HNid4PJs5yhOcQZHbUkBlUSBBiHNeZ93viHywI osb2NUMFgirjPHVbX+g0VJlKheVCCbMZe2F6RNjHoowuEm82T9ZBpOjfZayzP02AFLFwkH TbW9bbnlsRBbTXr9f/rTTFKTVkLkIXm9gn/8fI97xaH+/ph5z8Pzv6Xl0Au9j5DCywtI4t 1I92/gg+DOdo2w9bZ3GvThuggDEViwq1BLFWUQBxloVZFdI0VlUbqOtk0Yrwz6vZ6pGqxm NemWRub6n3miOWeZYtNPjgp0A6S9rVQcjjghSyBnRmNFa8TlS9E9AtqbUqYDuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740598310; a=rsa-sha256; cv=none; b=P/XD8LWWhpK02v2dFbC6Dervf5PSEpRj3NfeEQhVeS5VHgdhkPzwiVZZLub4MiAZmVfR3M MEO0ZuZ36huGlFBG+LWb40DUuVjsfoKHy4x9SG9m2cEYYnSnX/nWTKaNSWn1ETQgfvKijj 54rsc06yZbZ1NRcqlxKPg8FmRyCVEyC2sGibCt45VEXBoZRp2S8D/9WgrXaGpmlFS3UKFi KyM7gnXNgQZzjUNLLMlSgrfqwephNLHbp8TsyPRHLaTw6gcVow4c9sb5/pu7wF1tUTBks6 i1fdAyPHNCCk6uj5fQYuymzwGkIZ4Vi9Ngeh1cYe+PqQzY23JpjD8apbfD6+AQ== 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=1740598310; 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=nR0qHLnlv2AMDMcNRRYoAa3FwVQUTgoHLOBwsr3kV7w=; b=ep2QX1JL9xOkKRTaOUjKjvGvkyWR+jgEdjeMXxlqYqQFX3ifgcElqOGqlWFpbr9LD/4Ves oQy7wcybMrgi9Fpy5y6XI1rfdgeZ6td+EM3iesLT5prbIRu2MHFeOd3n1cPDUz81HVh0CL phafpqA4rzC8vvaiHcrB8JsOEo/lx0BJY1E73xD2+JbFZ1XPPyOlxnVbj1ngUrxbdkns2z EVxNjW2Rt0xLPI8itBEpMsl3J6BRDtK8wl2/ak3TuHel3N7dSzTrkfM15EZVWrEPvkQvaS Vm3274crk7mKyNm5zOAtqbxOnl/+9VUTLkXY1StV/GaKnG4rpwGm70zvmcVCCw== 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 4Z34NQ482Kz1NX9; Wed, 26 Feb 2025 19:31:50 +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 51QJVort018929; Wed, 26 Feb 2025 19:31:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51QJVoQi018926; Wed, 26 Feb 2025 19:31:50 GMT (envelope-from git) Date: Wed, 26 Feb 2025 19:31:50 GMT Message-Id: <202502261931.51QJVoQi018926@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 6fef9e7378d0 - main - net80211: update ieee80211_node_get_txrate_mbit() to support VHT 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fef9e7378d0af0e710ce7c3601886410db82cd6 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=6fef9e7378d0af0e710ce7c3601886410db82cd6 commit 6fef9e7378d0af0e710ce7c3601886410db82cd6 Author: Adrian Chadd AuthorDate: 2025-01-15 05:10:59 +0000 Commit: Adrian Chadd CommitDate: 2025-02-26 19:31:26 +0000 net80211: update ieee80211_node_get_txrate_mbit() to support VHT Update ieee80211_node_get_txrate_mbit() to use ieee80211_phy_vht_get_mcs_kbit() to calculate VHT rates. For now just assume long-GI; I'd have to go and do some extra work to figure out which short/long GI flag to use. Differential Revision: https://reviews.freebsd.org/D48613 --- sys/net80211/ieee80211_node.c | 58 ++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index bc0358feb7a8..f4185dfb04d4 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -3292,46 +3292,42 @@ ieee80211_node_set_txrate_vht_rate(struct ieee80211_node *ni, uint32_t ieee80211_node_get_txrate_kbit(struct ieee80211_node *ni) { - uint32_t mbps; + uint32_t kbps; - /* - * TODO: only handle legacy/HT rates, VHT will need - * to use other logic. - */ switch (ni->ni_txrate.type) { case IEEE80211_NODE_TXRATE_LEGACY: + kbps = ni->ni_txrate.dot11rate * 500; + break; case IEEE80211_NODE_TXRATE_HT: + /* Note: Valid for MCS 0..76 */ + { + const struct ieee80211_mcs_rates *mcs = + &ieee80211_htrates[ni->ni_txrate.dot11rate & + ~IEEE80211_RATE_MCS]; + + if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) { + if (ni->ni_flags & IEEE80211_NODE_SGI40) + kbps = mcs->ht40_rate_800ns * 500; + else + kbps = mcs->ht40_rate_400ns * 500; + } else { + if (ni->ni_flags & IEEE80211_NODE_SGI20) + kbps = mcs->ht20_rate_800ns * 500; + else + kbps = mcs->ht20_rate_400ns * 500; + } + } break; case IEEE80211_NODE_TXRATE_VHT: + /* Note: valid for VHT rates, assumes long-GI for now */ + kbps = ieee80211_phy_vht_get_mcs_kbit(ni->ni_chw, + ni->ni_txrate.nss, ni->ni_txrate.mcs, false); + break; default: - printf("%s: called for VHT / unknown rate (type %d)!\n", + printf("%s: called for unknown rate (type %d)!\n", __func__, ni->ni_txrate.type); return (0); } - /* Legacy / MCS rates */ - if (ni->ni_txrate.dot11rate & IEEE80211_RATE_MCS) { - const struct ieee80211_mcs_rates *mcs = - &ieee80211_htrates[ni->ni_txrate.dot11rate & - ~IEEE80211_RATE_MCS]; - if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) { - /* Note: these are in 1/2Mbit/s units */ - if (ni->ni_flags & IEEE80211_NODE_SGI40) - mbps = mcs->ht40_rate_800ns; - else - mbps = mcs->ht40_rate_400ns; - } else { - if (ni->ni_flags & IEEE80211_NODE_SGI20) - mbps = mcs->ht20_rate_800ns; - else - mbps = mcs->ht20_rate_400ns; - } - } else - /* Note: CCK/OFDM dot11rate entries are in 1/2Mbit/s units */ - mbps = ni->ni_txrate.dot11rate; - - /* - * Note; 'mbps' in 1/2 Mbit/s units so *500 to make it in kbit/s units. - */ - return (mbps * 500); + return (kbps); }