From nobody Wed Feb 26 19:31:53 2025 X-Original-To: dev-commits-src-main@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 4Z34NV55M6z5nkt0; Wed, 26 Feb 2025 19:31:54 +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 4Z34NV1Dmkz3dtp; Wed, 26 Feb 2025 19:31:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740598314; 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=8upJysKzA3TtraSjZY0lyJ/GXKJEP1P2q6Wm71H0fSk=; b=T1ky5aGYXFpw2x8jhmuueqTK1TQpY7TD2fcl+O7iycASHvzJN5W7K+fDoxwnChGdpyhBLs mq2W/stPEDojd53+ytWm47+qiJVJRPrG/JRz2az4H07WnDqeyUkkk/01/V3X4k/dRhfeIx 17lKhLNeSaS0/nwLZfkvQIAuzV2yChqx/5KEyaLKssmXi1X0X4wSdIYqLNYN7A0aQOAlP9 FUwBJvh7z+W8VpXgCddpX9jsJIqZ9dGm32R/g7m5nSIriSd5RYMnGthTLAKLU5gbjNc4CE TXmvWFapTKgK3Qq8W3s5vR3VnMVPMYpONDnNmQtF4Pqd9VCq+c8kF5KMqFw0JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740598314; a=rsa-sha256; cv=none; b=PYg4JFaZR6flrnW0rvM+McQS11WbeALI02qWIxa0TcOk65vOCo6SyHdiz4j56ufjuHz8Fl uY5nshuTFKVtj6Z6TKm6sEvRk2TUv0BbRCouxjxSRlaXYEshrKkEmkfNbW3NjVbTMNOsx0 aMyZpFci0EUaMh2bx5ebprg7Jb5LnldF8ocitVoGLHfLpalDidSj7NDcJathsuGtedBbal fsR8bvDXcVToTuEazdfXrbtAVjpGRG8xxM8A+h1YC4GgK8ii0k3vwEMQJirCGAhFoOZCLT VFQLEjqtCr1s2C5uaBHx/fD1yXT6Rh95ifr70qb6p6GXfxaBHwaiCnXyYreU6w== 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=1740598314; 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=8upJysKzA3TtraSjZY0lyJ/GXKJEP1P2q6Wm71H0fSk=; b=gaeiyZ7SR+AbZIpfLyRd8e4SxEPP4JzG9u7fdI2XoZJ2eLhDyid7sYyh5tLQaiV6xZGh3R oDXYbWGxfYmLHvaJ4h7Ehj3SC1++OqxRn1ImCdyonAlOnTR3BrmazZtOBL/sbZsTuvJJyp ds2ZJ6KwmKrQYvh0UoKU/qbNX/5I/vZVUlSGUg+GXQ/qva0K1vhatzERZchawg08FV1ck8 RhTILoekftec3vv6PyT2n0yGBdKvwNVpmF7rqYx1gv38mGa8LQeO1LjP9rISpzEpVMjc7W okoYw7oqcCez54rNJcgIR/w83mVHJiMC+uELz7NgWFEVOMgRd9DxmJedamxk0w== 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 4Z34NT6nxgz1P4L; Wed, 26 Feb 2025 19:31:53 +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 51QJVr1d019034; Wed, 26 Feb 2025 19:31:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51QJVrdh019031; Wed, 26 Feb 2025 19:31:53 GMT (envelope-from git) Date: Wed, 26 Feb 2025 19:31:53 GMT Message-Id: <202502261931.51QJVrdh019031@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: 17e8437e8d05 - main - net80211: update get_sta_info() to only populate isi_txrate for legacy rates List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 17e8437e8d05aa91f2d1f31cece68204e7294a74 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=17e8437e8d05aa91f2d1f31cece68204e7294a74 commit 17e8437e8d05aa91f2d1f31cece68204e7294a74 Author: Adrian Chadd AuthorDate: 2025-01-17 02:41:14 +0000 Commit: Adrian Chadd CommitDate: 2025-02-26 19:31:27 +0000 net80211: update get_sta_info() to only populate isi_txrate for legacy rates The isi_txrate field is 8 bits and only represents legacy/HT rates. So to avoid logging a warning, only populate if it's a legacy/HT rate. Differential Revision: https://reviews.freebsd.org/D48616 --- sys/net80211/ieee80211_ioctl.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 24ec9659dc2d..caa0c77e2897 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -376,6 +376,7 @@ static void get_sta_info(void *arg, struct ieee80211_node *ni) { struct stainforeq *req = arg; + struct ieee80211_node_txrate tr; struct ieee80211vap *vap = ni->ni_vap; struct ieee80211req_sta_info *si; size_t ielen, len; @@ -406,7 +407,16 @@ get_sta_info(void *arg, struct ieee80211_node *ni) if (si->isi_nrates > 15) si->isi_nrates = 15; memcpy(si->isi_rates, ni->ni_rates.rs_rates, si->isi_nrates); - si->isi_txrate = ieee80211_node_get_txrate_dot11rate(ni); + /* + * isi_txrate can only represent the legacy/HT rates. + * Only set it if the rate is a legacy/HT rate. + * + * TODO: For VHT and later rates the API will need changing. + */ + ieee80211_node_get_txrate(ni, &tr); + if ((tr.type == IEEE80211_NODE_TXRATE_LEGACY) || + (tr.type == IEEE80211_NODE_TXRATE_HT)) + si->isi_txrate = ieee80211_node_get_txrate_dot11rate(ni); /* Note: txmbps is in 1/2Mbit/s units */ si->isi_txmbps = ieee80211_node_get_txrate_kbit(ni) / 500; si->isi_associd = ni->ni_associd;