Module Name: src
Committed By: knakahara
Date: Mon Mar 1 04:50:18 UTC 2021
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Refactor rxq->rxq_ptr updating.
To generate a diff of this commit:
cvs rdiff -u -r1.700 -r1.701 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.700 src/sys/dev/pci/if_wm.c:1.701
--- src/sys/dev/pci/if_wm.c:1.700 Mon Mar 1 04:49:11 2021
+++ src/sys/dev/pci/if_wm.c Mon Mar 1 04:50:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.700 2021/03/01 04:49:11 knakahara Exp $ */
+/* $NetBSD: if_wm.c,v 1.701 2021/03/01 04:50:17 knakahara Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.700 2021/03/01 04:49:11 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.701 2021/03/01 04:50:17 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -9177,7 +9177,6 @@ wm_rxeof(struct wm_rxqueue *rxq, u_int l
for (i = rxq->rxq_ptr;; i = WM_NEXTRX(i)) {
if (limit-- == 0) {
- rxq->rxq_ptr = i;
more = true;
DPRINTF(sc, WM_DEBUG_RX,
("%s: RX: loop limited, descriptor %d is not processed\n",
@@ -9203,11 +9202,6 @@ wm_rxeof(struct wm_rxqueue *rxq, u_int l
#endif
if (!wm_rxdesc_dd(rxq, i, status)) {
- /*
- * Update the receive pointer holding rxq_lock
- * consistent with increment counter.
- */
- rxq->rxq_ptr = i;
break;
}
@@ -9333,7 +9327,6 @@ wm_rxeof(struct wm_rxqueue *rxq, u_int l
/* Set up checksum info for this packet. */
wm_rxdesc_ensure_checksum(rxq, status, errors, m);
- rxq->rxq_ptr = i;
rxq->rxq_packets++;
rxq->rxq_bytes += len;
/* Pass it on. */
@@ -9342,6 +9335,7 @@ wm_rxeof(struct wm_rxqueue *rxq, u_int l
if (rxq->rxq_stopping)
break;
}
+ rxq->rxq_ptr = i;
if (count != 0)
rnd_add_uint32(&sc->rnd_source, count);
