From nobody Sat Dec 07 00:23:08 2024 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 4Y4pkN44l2z5g8Rj; Sat, 07 Dec 2024 00:23:08 +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 4Y4pkN3dfrz4Nsh; Sat, 7 Dec 2024 00:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733530988; 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=KqpEY7btv+Q+NcaovUrEoZ40tba9mqyjGRlt2EH5hpY=; b=jGRCyIELeJ9bFgMycqP6ao1dNtPddowR5DxPIX7yX5eDzUAlaMOH5fjYBWj2zh7g/8d4Sl a22ixyZQetVsxAkq5cp/V4p0B3BJdDWzzeeO9jxVHExBgqNYYYjMtCuC9V8Krd51y8RYtt 8RypNJtE7y2tuum43HER5+OEkaI4uDUksT+eA7z2LoT4FCkJRgNgAwQNq8w7Z8GncNPEca 6uv4YyeIF7AE9vjdH59GfjRlXePQkJv4+mS8yRXVgMv1ffRv75gp8szYOmJgfGPB04KVgw 1qJ/o9Fk2yUZhyGjABNQBhA6w7kAXaZFkpsg3yYDCF/AUuJo8ZZ0Qh3pPeNuQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733530988; 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=KqpEY7btv+Q+NcaovUrEoZ40tba9mqyjGRlt2EH5hpY=; b=bwwhKIe8tuw0wcL+kHuUd2nXbt5gpKlSN2KKUa3aV8NuJKvbip9uQOyD0QrrRNHTedsBCV CdfJujEgJcA1g1WRjBaickuPzy4VNC/G/iPpZVmIjX2gRXtGIvNPkJFpjfeBjyJXrgTdAb 2VA/fbURhGW3w5jaDehApPwvmHz6FNmoh1/slcn7lMWVQm6Harq3sdL9pbrUUXI/1GmKbV K9Iq49u1+kmm8+8z+5SYEcu7IMjb9BG743RUV+Ka2kkbRi5IwV3wAy+xrXdL2eJZubeSte sAL3HEboCcgrJrDy7+UGJwisNFYB8GD+xOgrPXX2w5RPEvyyI2g+olSr4fWcpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733530988; a=rsa-sha256; cv=none; b=EG8WQ+TGIP0ho8YYHCavcjvIXJ4ZhKJYApOn/3bMz5c6NL/JpUMnPXAiWGKjx76f/9+J1x jt9alzlZO/Y0xzEdsHPfxRWZjIKbR/CrITnhiyziWrenq96qJV6pKcD4lHB6fPusIpzJ+x ZHFl/eagNSBTCS5C+E65eS+3hZ63yEXPfwc6H5K/ccBJC73yCveSLzW1v32p8Qx9LVUA6F lUZIlV89F6/awIl0aevpDTEkhQINBrRbbuRP1R8AEwaVLFtxwn8sXooEOBqQ7dsHh9qTS4 Zov+SQ26kXFvrJFXYJWUZXYkK1A2nuSg9ulYt+Bpp2hR5RITRw2VsEeRc3/Krw== 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 4Y4pkN3DXMz10lh; Sat, 7 Dec 2024 00:23:08 +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 4B70N8wW094209; Sat, 7 Dec 2024 00:23:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B70N8v4094206; Sat, 7 Dec 2024 00:23:08 GMT (envelope-from git) Date: Sat, 7 Dec 2024 00:23:08 GMT Message-Id: <202412070023.4B70N8v4094206@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: 351356090998 - main - rtwn: use ieee80211_ht_check_tx_ht40() to transmit HT40 frames 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: 3513560909981a349c6edfca44fa2656b7eefeb5 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=3513560909981a349c6edfca44fa2656b7eefeb5 commit 3513560909981a349c6edfca44fa2656b7eefeb5 Author: Adrian Chadd AuthorDate: 2024-12-02 07:13:40 +0000 Commit: Adrian Chadd CommitDate: 2024-12-07 00:22:32 +0000 rtwn: use ieee80211_ht_check_tx_ht40() to transmit HT40 frames Using ieee80211_ht_check_tx_ht40() means that not only the bss and node channel are checked, but the ni_chw value is also now correctly checked. Differential Revision: https://reviews.freebsd.org/D47862 --- sys/dev/rtwn/rtl8192c/r92c_tx.c | 3 +-- sys/dev/rtwn/rtl8812a/r12a_tx.c | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/rtwn/rtl8192c/r92c_tx.c b/sys/dev/rtwn/rtl8192c/r92c_tx.c index a3e92e1b7ebb..8a4c6581832b 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_tx.c +++ b/sys/dev/rtwn/rtl8192c/r92c_tx.c @@ -66,8 +66,7 @@ r92c_tx_set_ht40(struct rtwn_softc *sc, void *buf, struct ieee80211_node *ni) { struct r92c_tx_desc *txd = (struct r92c_tx_desc *)buf; - if (ni->ni_chan != IEEE80211_CHAN_ANYC && - IEEE80211_IS_CHAN_HT40(ni->ni_chan)) { + if (ieee80211_ht_check_tx_ht40(ni)) { int extc_offset; extc_offset = r92c_tx_get_sco(sc, ni->ni_chan); diff --git a/sys/dev/rtwn/rtl8812a/r12a_tx.c b/sys/dev/rtwn/rtl8812a/r12a_tx.c index e6b5111063f7..8b16be17f8eb 100644 --- a/sys/dev/rtwn/rtl8812a/r12a_tx.c +++ b/sys/dev/rtwn/rtl8812a/r12a_tx.c @@ -59,7 +59,7 @@ static int r12a_get_primary_channel(struct rtwn_softc *sc, struct ieee80211_channel *c) { - /* XXX 80 MHz */ + /* XXX VHT80; VHT40 */ if (IEEE80211_IS_CHAN_HT40U(c)) return (R12A_TXDW5_PRIM_CHAN_20_80_2); else @@ -71,9 +71,8 @@ r12a_tx_set_ht40(struct rtwn_softc *sc, void *buf, struct ieee80211_node *ni) { struct r12a_tx_desc *txd = (struct r12a_tx_desc *)buf; - /* XXX 80 Mhz */ - if (ni->ni_chan != IEEE80211_CHAN_ANYC && - IEEE80211_IS_CHAN_HT40(ni->ni_chan)) { + /* XXX VHT80; VHT40; VHT20 */ + if (ieee80211_ht_check_tx_ht40(ni)) { int prim_chan; prim_chan = r12a_get_primary_channel(sc, ni->ni_chan);