From nobody Thu Dec 19 16:08:39 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 4YDb7q5gfsz5hPW5; Thu, 19 Dec 2024 16:08:39 +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 4YDb7q3Qhbz4ntN; Thu, 19 Dec 2024 16:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734624519; 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=FZgxr+rpVjobO+j2a/IFGgoKFdoxcIRtLoHj9f66E6I=; b=jIkvSdobKEiDgFjVV119Tvy/aNPrneD7E0LwJDXS87MeWhhmU5ThK2xMcTgdrlLsMU+l/M mmsxid1dYZ5BLqQ//3zK/rh2JNFb6qmm7cEH2LHjaAf4zhqGdg794kv/KnyBni4gbeihIu trUK6k0kQubw8fPDjQnbmkKIRKLiBB8w61/GDyNysHuC2bKv47f5oiuhnOs6+IasnQeM4f BpwdQGyWuS1iHtW8bKh7TvHb/u31TX/x5hDblSAsmludGnoxqyry5EIuBm/z+85w2Jzl8v KaOZqEjtwUZw6+k48nlCEFCFtf9pnDWBqRfmJjWJtGNUmXZMFlvxIafkpkccBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734624519; 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=FZgxr+rpVjobO+j2a/IFGgoKFdoxcIRtLoHj9f66E6I=; b=EXzNnaCOTDPLIEWdphmQdwiYuI4EVvFWrl1OfTZiUJHZzy8E2ilskF6O23KCra6UNrpzLP TYQvUMyEi6jd7YZW8AYJgU3NxRH18dnkSLAzJwkOB0lQ1ROAF+Jb+PxyYDoUdmBJEYRKex IjiKEfbWTJc9txbNtOcyg7Mb1Cm9WTx2XCzlmZ99pFvpkl5h8EQifGN6S3pR3jg3GIRNsa zPNJHI6rkvsuCaS/ajIRNUYnb7QddgcV94YhFnSewQjChp8suujuJ+2ejaLBK+N0ALCl2Y 3J6Y02jVqmV4kqaFWi5iRH/Sb+Kc8hJbLtCX5pI/Tm1WtVxaQ0a6gd+G89gp2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734624519; a=rsa-sha256; cv=none; b=MFhwuNjitljr/K/UipY0kBk+lBwjGLy46NSoE/vzEfY0e1na7w0vQxSY0x30k4V5ICPeN2 /7HgFg1guxlnaNPmw9PXJLbQFsnuKNhh+y1N1EEFKzBZvIqyV7bcWuWWztwdLcP9uJYvNe Wz+Ainl0JUOAHqaYmjkhBqm3H9v84TpODGBCzLIQy1C38Ot2I1nwchXNuiXOHgPpNLuSl3 Az5Jc9s4XoaDHWBaMHioePriQxGGAsvhVCag6/ERTueE/BY7Jqtv49py5uQXkEeuh9ydd4 FH59o7zbqyWGZCpIPrqHgq/pWVtwLVKFT53zBRMIpw3oN/5aexKo2fHbmX66GQ== 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 4YDb7q1YFjz11Hv; Thu, 19 Dec 2024 16:08:39 +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 4BJG8d3E073172; Thu, 19 Dec 2024 16:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BJG8dHb073169; Thu, 19 Dec 2024 16:08:39 GMT (envelope-from git) Date: Thu, 19 Dec 2024 16:08:39 GMT Message-Id: <202412191608.4BJG8dHb073169@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: 300c843b075c - main - rtwn: bring the r92c rate control setup selection in line with tx descriptors 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: 300c843b075c4f8467cc433d6f92e6fefc7ebbb4 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=300c843b075c4f8467cc433d6f92e6fefc7ebbb4 commit 300c843b075c4f8467cc433d6f92e6fefc7ebbb4 Author: Adrian Chadd AuthorDate: 2024-12-14 19:01:37 +0000 Commit: Adrian Chadd CommitDate: 2024-12-19 16:08:24 +0000 rtwn: bring the r92c rate control setup selection in line with tx descriptors The rate control message was doing 11g+11n without 11b rates, but the TX descriptor setup supports also falling back on 11b rates when doing multi-rate retry / per-descriptor rate control. So, line them up. They're not exactly the same as the TX path supports pure-N and pure-G modes which the rate control configuration does not, but there'll need to be a lot more work on supporting those operating modes anyway (around things like self-generated frame rate control/masks, beacon config, RTS/CTS selection, etc.) Locally tested: * RTL8192CU, STA mode Differential Revision: https://reviews.freebsd.org/D48081 Reviewed by: bz --- sys/dev/rtwn/rtl8192c/r92c_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/rtwn/rtl8192c/r92c_fw.c b/sys/dev/rtwn/rtl8192c/r92c_fw.c index 939cd942f5e2..384cd50e901a 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_fw.c +++ b/sys/dev/rtwn/rtl8192c/r92c_fw.c @@ -172,7 +172,7 @@ r92c_send_ra_cmd(struct rtwn_softc *sc, int macid, uint32_t rates, /* Set rates mask for unicast frames. */ if (RTWN_RATE_IS_HT(maxrate)) - mode = R92C_RAID_11GN; + mode = R92C_RAID_11BGN; else if (RTWN_RATE_IS_OFDM(maxrate)) mode = R92C_RAID_11BG; else