From nobody Fri Apr 14 15:22:24 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 4PygDK28RXz45RZc; Fri, 14 Apr 2023 15:22:25 +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 4PygDK1CL8z3sVN; Fri, 14 Apr 2023 15:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681485745; 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=b/+kEnJvMybAMBWsno2tKhHTCNjhOQfnsUgIi/JFNgk=; b=rRicUlOOjSdMZt2tQOrbVIIh0kknsmFQf2UrRebBL6TvL9oYuMXESHFSO6+E5AJOCFjDTC tdcFu7dr4vm2SyjKBfd2GmWG9KllF/UW19A2Rsl4AUkRYxbF2Eu/1XfyKKrqf0/DkBK0an 88vGWwn5x7wVj7RqoP6JtoELV9Qx1ObFI8REDWBKj4JBJSS0BZLWNrBhY5hSpQvhtMKvCA rAm7wozbjn231OEC3GAFf1KxyCchyCVu4BZAuzRflvlxckdHWNIcfr2as0YfA9LlHmz4Zf i/hCThntOj1EdJKAaXwoBRmIJa/8udq8vzB0t6Zo+/tM/rG01VgWAdtCVOQnRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681485745; 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=b/+kEnJvMybAMBWsno2tKhHTCNjhOQfnsUgIi/JFNgk=; b=T2OM5AXw8pYvm4Z718rwS0U+63tFqKWsabQWmE3a3Rarg4v+heDHAFejwhsMUTiChru/9G 7DTG0B0g5os1DQkGRMJcE27n6Z7qisYdQiV6sm2i12Ub5h/0Av5e0nig/l9igq7rJZD2hI PXPOM22TDq3VKLgmtp5H0QSrvqa9T02z2dmMxj3Sd3Xo0m+3usIzT7CAS3cproLyXdsnBM aRmp4FMpKG2Cf2yxtbj119NU0CUEEax40T9pl0MGS+uNhD0Ewbo7sTJRX3YqHdAj8LcnHp FnE8IcKWTYMl9VPrBGAPoOX+vlIRftfvnQNFHNoKhYW8qzEO8BYjEoLhDaQEXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681485745; a=rsa-sha256; cv=none; b=Mjb0cEZBWxBAd/YBIuwz08tEqHM0fimkoOlaOH/y0E1elyolJca2t2UWpJvWpiDSJjIfQK N1zP+7+bt5IFAJjvhf/LLI55tGTd49+8tAlBa+erNZzOjygBbEw6ivgLsDFOGrTsPYg1ie S8CMo8jHlpcZbgFGxabOPsBf/jiOR2czMG33f+zPOVsD7D+OFtO6f7H+GzS5xoMJAjLNEP 3206lmKYkwwCnOSyc7JUWVkcfGzu7O06Cm1ZM7nKBHIwoCxwBOXvJHyg9ab+IiC/S8zL1Z E0HgJeZHLI9e8M2/TqITeAXGx+issBlbKQkA1X2vpuN63MtiOdqFGhPw6NEkAA== 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 4PygDJ72x6zVPw; Fri, 14 Apr 2023 15:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EFMOYT021591; Fri, 14 Apr 2023 15:22:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EFMObi021590; Fri, 14 Apr 2023 15:22:24 GMT (envelope-from git) Date: Fri, 14 Apr 2023 15:22:24 GMT Message-Id: <202304141522.33EFMObi021590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mikhail Pchelin Subject: git: 2f53b5991ce0 - main - net80211: fix a typo in Rx MCS set for unequal modulation case 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: misha X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f53b5991ce05b7e6f2b1eb826cd902fb255a9eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by misha: URL: https://cgit.FreeBSD.org/src/commit/?id=2f53b5991ce05b7e6f2b1eb826cd902fb255a9eb commit 2f53b5991ce05b7e6f2b1eb826cd902fb255a9eb Author: Mikhail Pchelin AuthorDate: 2023-04-14 15:20:09 +0000 Commit: Mikhail Pchelin CommitDate: 2023-04-14 15:20:09 +0000 net80211: fix a typo in Rx MCS set for unequal modulation case RX MCS set defines which MCSs are supported for RX, bits 0-31 are for equal modulation of the streams, bits 33-76 are for unequal case. Current code checks txstreams variable instead of rxstreams to set bits from 53 to 76 for 4 spatial streams case. The modulations are defined in tables 19-38 and 19-41 of the IEEE Std 802.11-2020. Spotted by bz in https://reviews.freebsd.org/D39476 Reviewed by: bz Approved by: bz Sponsored by: Serenity Cybersecurity, LLC Differential Revision: https://reviews.freebsd.org/D39568 --- sys/net80211/ieee80211_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index f98316bc5088..2bdbc101d861 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -3203,7 +3203,7 @@ ieee80211_set_mcsset(struct ieee80211com *ic, uint8_t *frm) for (i = 39; i <= 52; i++) setbit(frm, i); } - if (ic->ic_txstream >= 4) { + if (ic->ic_rxstream >= 4) { for (i = 53; i <= 76; i++) setbit(frm, i); }