Module Name: src
Committed By: nat
Date: Thu Apr 16 17:18:28 UTC 2020
Modified Files:
src/sys/dev/ic: rtwnreg.h
src/sys/dev/usb: if_urtwn.c
Log Message:
Correct rx packet count for 8192EU. Tested OK.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/rtwnreg.h
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/usb/if_urtwn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/rtwnreg.h
diff -u src/sys/dev/ic/rtwnreg.h:1.2 src/sys/dev/ic/rtwnreg.h:1.3
--- src/sys/dev/ic/rtwnreg.h:1.2 Thu Jul 25 14:31:35 2019
+++ src/sys/dev/ic/rtwnreg.h Thu Apr 16 17:18:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwnreg.h,v 1.2 2019/07/25 14:31:35 msaitoh Exp $ */
+/* $NetBSD: rtwnreg.h,v 1.3 2020/04/16 17:18:27 nat Exp $ */
/* $OpenBSD: r92creg.h,v 1.16 2017/09/22 13:41:56 kevlo Exp $ */
/*-
@@ -1341,6 +1341,8 @@ struct r92c_rx_desc_usb {
#define R92C_RXDW2_PKTCNT_M 0x00ff0000
#define R92C_RXDW2_PKTCNT_S 16
+#define R92E_RXDW2_PKTCNT_M 0x3fc00000
+#define R92E_RXDW2_PKTCNT_S 22
#define R92C_RXDW3_RATE_M 0x0000003f
#define R92C_RXDW3_RATE_S 0
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.85 src/sys/dev/usb/if_urtwn.c:1.86
--- src/sys/dev/usb/if_urtwn.c:1.85 Sat Apr 4 08:46:01 2020
+++ src/sys/dev/usb/if_urtwn.c Thu Apr 16 17:18:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.85 2020/04/04 08:46:01 skrll Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.86 2020/04/16 17:18:27 nat Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.85 2020/04/04 08:46:01 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.86 2020/04/16 17:18:27 nat Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2527,7 +2527,10 @@ urtwn_rxeof(struct usbd_xfer *xfer, void
/* Get the number of encapsulated frames. */
stat = (struct r92c_rx_desc_usb *)buf;
- npkts = MS(le32toh(stat->rxdw2), R92C_RXDW2_PKTCNT);
+ if (ISSET(sc->chip, URTWN_CHIP_92EU))
+ npkts = MS(le32toh(stat->rxdw2), R92E_RXDW2_PKTCNT);
+ else
+ npkts = MS(le32toh(stat->rxdw2), R92C_RXDW2_PKTCNT);
DPRINTFN(DBG_RX, "Rx %jd frames in one chunk", npkts, 0, 0, 0);
if (npkts != 0)
