From nobody Sat Dec 28 01:47:02 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 4YKlbV6LXsz5jhsY; Sat, 28 Dec 2024 01:47:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKlbV5SJMz4GDc; Sat, 28 Dec 2024 01:47:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735350422; 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=FESKnCd25cjbAThG+RbURWOV6DS/zvL/4BH7SwyC30g=; b=Nhq+iqJQva0vFkpzh07qxya17D2aDs3Gs147R+3qJJ4LkPbyKg+Nd0DsYdp/sCY0r5PpiH peQGATHmWtkreuTKf1ESC6cnBPVJqK2BtTW0aRa6pXHekag3nxO3brmrz5UIrOSa0UFOlY tEY8xZLCPR9Jr5cmzON6Boxe/Jg9hHZaT20efLs24Gv5nyJz8uWbFJ9JSxo5R1au00/kv9 GDF3EMNvMcPXPlRVdPRXXtehlYQvp5zCy/vtH998Z5tkfrpvaNloeiTtLgFLudO2YrIUf7 rkjBGeS0oAtmcpPxdEMReHJrraqXx3vAu5b/ihztP90LeXYUJj81gwTwYfiB+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735350422; 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=FESKnCd25cjbAThG+RbURWOV6DS/zvL/4BH7SwyC30g=; b=mMot7cwvgb3Si44b7htLzAQsabdR3MdqfyAn9wlfIvCp/naHN+U5cAf4Aubth4YNzT/kOl OqIK4FG8B7clpPWlG3e7At9Hv7v9QRRqOZp/DgdQTD7dF6AA0mgXa/Aggs16xqPAualo41 Azsx1P13Cmysyk2B4smpZ7O+fBmpQEv/ZvCUMmhCzFPYLM86oyaj6khvZqcVKWhzv5BIRF SCn8zVcv0sRzzUdYGvgceyHN0tqBsQEf+Lj65Qaglp3c5ewYD2Pv5vPXh1ZE7aBoYQ1KSZ O0aEAfuBiO2IwFR9zc9UJRwIDCrLB6CsHDzZWf2FvTHMgPRmjMlCbANTUMwcXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735350422; a=rsa-sha256; cv=none; b=S+8flronbwqRgZ5IA99P4UHGnaQTkquvch78bLUdOMIN5iawZ4BKwOOiyj/nofxOh/v0Bp 1QPrvZQbyTHBXdJf5GD48/0WWeYJ1D2hrvrc0O6F0aAAqJmK/g12MjQGvae35+G1jk2oFZ qG9qjg1ki9aClT6aFR99wu5/GaJ1gfrqwTZ8T0iIuK+W1zGa8AAeQUb82J75I0feB3W+ey BRSOSL5g3c1NgKXcI4fzYe+93S2rAkeoXVGc8HR+k5JsKGBYVahMSa9jtm+OA8/aAk0lNB NTBXDATk07EUSthAscyNCQnMcQzxEzgXEDuZKVq5znfHKeCgktLt/f0Qi2W6cw== 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 4YKlbV4wmhz14GS; Sat, 28 Dec 2024 01:47:02 +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 4BS1l24T010515; Sat, 28 Dec 2024 01:47:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BS1l2iT010512; Sat, 28 Dec 2024 01:47:02 GMT (envelope-from git) Date: Sat, 28 Dec 2024 01:47:02 GMT Message-Id: <202412280147.4BS1l2iT010512@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: 791170aaf7ef - main - rtwn: make sure RCR_APPFCS stays set in monitor mode / mode changes. 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: 791170aaf7efb4e053ccbf537d80a43e8a81d1e4 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=791170aaf7efb4e053ccbf537d80a43e8a81d1e4 commit 791170aaf7efb4e053ccbf537d80a43e8a81d1e4 Author: Adrian Chadd AuthorDate: 2024-12-16 20:09:56 +0000 Commit: Adrian Chadd CommitDate: 2024-12-28 01:46:38 +0000 rtwn: make sure RCR_APPFCS stays set in monitor mode / mode changes. My previous commit meant that APPFCS wasn't enabled during monitor mode and likely other corner cases. Ensure it stays on at all times. This, amusingly, fixes monitor mode in RTL8812AU/RTL8821AU - without it, I don't see HT/VHT frames in monitor mode but I can still receive them in normal STA mode. Differential Revision: https://reviews.freebsd.org/D48112 --- sys/dev/rtwn/if_rtwn_rx.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/rtwn/if_rtwn_rx.c b/sys/dev/rtwn/if_rtwn_rx.c index b1465dd80ee7..e5ddc7a3cb97 100644 --- a/sys/dev/rtwn/if_rtwn_rx.c +++ b/sys/dev/rtwn/if_rtwn_rx.c @@ -532,7 +532,7 @@ rtwn_set_promisc(struct rtwn_softc *sc) RTWN_ASSERT_LOCKED(sc); mask_all = R92C_RCR_ACF | R92C_RCR_ADF | R92C_RCR_AMF | R92C_RCR_AAP; - mask_min = R92C_RCR_APM | R92C_RCR_APPFCS; + mask_min = R92C_RCR_APM; if (sc->bcn_vaps == 0) mask_min |= R92C_RCR_CBSSID_BCN; @@ -551,5 +551,12 @@ rtwn_set_promisc(struct rtwn_softc *sc) sc->rcr &= ~mask_min; sc->rcr |= mask_all; } + + /* + * Add FCS, to work around occasional 4 byte truncation. + * See the previous comment above R92C_RCR_APPFCS. + */ + sc->rcr |= R92C_RCR_APPFCS; + rtwn_rxfilter_set(sc); }