aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Chadd <adrian@FreeBSD.org>2024-12-11 05:16:54 +0000
committerAdrian Chadd <adrian@FreeBSD.org>2024-12-19 16:07:28 +0000
commiteb6314510c882472628984e6190e39a6ab70687e (patch)
treedef10e12a8af6999525a23f094b994e2bcb3ff21
parentaaaca5f288fa257a745743d03e51eef0517b246f (diff)
rtwn: disable a workaround introduced earlier for RTL8192CU TX performance
I'm unable to reproduce the original problem with my RTL8192CU USB devices with the current codebase and I can't find any reference to what this power register is doing - I see it defined in drivers, but it's not described or used anywhere. This reverts 7f740971658d71c1ee95ee68032b4696c1684845 - rtwn_usb(4): fix Tx instability with RTL8192CU chipsets In any case being able to do higher rate RTS/CTS is beneficial. Local testing: * rtl8192cu, STA mode, TX/RX testing PR: 233949 Differential Revision: https://reviews.freebsd.org/D48026 Reviewed by: imp
-rw-r--r--sys/dev/rtwn/rtl8192c/r92c_tx.c6
-rw-r--r--sys/dev/rtwn/rtl8192c/usb/r92cu_init.c2
2 files changed, 0 insertions, 8 deletions
diff --git a/sys/dev/rtwn/rtl8192c/r92c_tx.c b/sys/dev/rtwn/rtl8192c/r92c_tx.c
index 9583a7e1119e..313f79e216e6 100644
--- a/sys/dev/rtwn/rtl8192c/r92c_tx.c
+++ b/sys/dev/rtwn/rtl8192c/r92c_tx.c
@@ -212,12 +212,6 @@ r92c_tx_setup_macid(void *buf, int id)
struct r92c_tx_desc *txd = (struct r92c_tx_desc *)buf;
txd->txdw1 |= htole32(SM(R92C_TXDW1_MACID, id));
-
- /* XXX does not belong here */
- /* XXX temporary (I hope) */
- /* Force CCK1 for RTS / CTS frames (driver bug) */
- txd->txdw4 &= ~htole32(SM(R92C_TXDW4_RTSRATE, R92C_TXDW4_RTSRATE_M));
- txd->txdw4 &= ~htole32(R92C_TXDW4_RTS_SHORT);
}
static int
diff --git a/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c b/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c
index 42e50ff9f8bd..10d812dd7a80 100644
--- a/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c
+++ b/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c
@@ -354,8 +354,6 @@ void
r92cu_post_init(struct rtwn_softc *sc)
{
- rtwn_write_4(sc, R92C_POWER_STATUS, 0x5);
-
/* Perform LO and IQ calibrations. */
r92c_iq_calib(sc);
/* Perform LC calibration. */