summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormsaitoh <msaitoh@NetBSD.org>2022-07-06 06:31:47 +0000
committermsaitoh <msaitoh@NetBSD.org>2022-07-06 06:31:47 +0000
commit09c9f3ab6bd767a9430a9e2494667a2467b86bc1 (patch)
tree947e79f89c19363cf5d7ef1fda738dbd48ba5f50 /sys/dev
parente7d9525c0560439bcd696ececffd87a88dca97bb (diff)
Call txeof first, then rxeof for the consistency.
There are three functions where the txeof and rxeof are called. The legacy interrupt function and MSI-X function call rxeof first, then rxeof. For the workqueue function. rxeof is called first. Modify it to match with other two.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/ixgbe/ixgbe.c8
-rw-r--r--sys/dev/pci/ixgbe/ixv.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/pci/ixgbe/ixgbe.c b/sys/dev/pci/ixgbe/ixgbe.c
index f5ad5fee2e0..b9232b4dc2d 100644
--- a/sys/dev/pci/ixgbe/ixgbe.c
+++ b/sys/dev/pci/ixgbe/ixgbe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.322 2022/06/18 08:20:56 skrll Exp $ */
+/* $NetBSD: ixgbe.c,v 1.323 2022/07/06 06:31:47 msaitoh Exp $ */
/******************************************************************************
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.322 2022/06/18 08:20:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.323 2022/07/06 06:31:47 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -6662,9 +6662,8 @@ ixgbe_handle_que(void *context)
IXGBE_EVC_ADD(&que->handleq, 1);
if (ifp->if_flags & IFF_RUNNING) {
- more = ixgbe_rxeof(que);
IXGBE_TX_LOCK(txr);
- more |= ixgbe_txeof(txr);
+ more = ixgbe_txeof(txr);
if (!(adapter->feat_en & IXGBE_FEATURE_LEGACY_TX))
if (!ixgbe_mq_ring_empty(ifp, txr->txr_interq))
ixgbe_mq_start_locked(ifp, txr);
@@ -6674,6 +6673,7 @@ ixgbe_handle_que(void *context)
&& (!ixgbe_legacy_ring_empty(ifp, NULL)))
ixgbe_legacy_start_locked(ifp, txr);
IXGBE_TX_UNLOCK(txr);
+ more |= ixgbe_rxeof(que);
}
if (more) {
diff --git a/sys/dev/pci/ixgbe/ixv.c b/sys/dev/pci/ixgbe/ixv.c
index f90b814d950..b6a93ac1e09 100644
--- a/sys/dev/pci/ixgbe/ixv.c
+++ b/sys/dev/pci/ixgbe/ixv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ixv.c,v 1.182 2022/06/02 01:57:27 msaitoh Exp $ */
+/* $NetBSD: ixv.c,v 1.183 2022/07/06 06:31:47 msaitoh Exp $ */
/******************************************************************************
@@ -35,7 +35,7 @@
/*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 331224 2018-03-19 20:55:05Z erj $*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.182 2022/06/02 01:57:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.183 2022/07/06 06:31:47 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -3296,9 +3296,8 @@ ixv_handle_que(void *context)
IXGBE_EVC_ADD(&que->handleq, 1);
if (ifp->if_flags & IFF_RUNNING) {
- more = ixgbe_rxeof(que);
IXGBE_TX_LOCK(txr);
- more |= ixgbe_txeof(txr);
+ more = ixgbe_txeof(txr);
if (!(adapter->feat_en & IXGBE_FEATURE_LEGACY_TX))
if (!ixgbe_mq_ring_empty(ifp, txr->txr_interq))
ixgbe_mq_start_locked(ifp, txr);
@@ -3308,6 +3307,7 @@ ixv_handle_que(void *context)
&& (!ixgbe_legacy_ring_empty(ifp, NULL)))
ixgbe_legacy_start_locked(ifp, txr);
IXGBE_TX_UNLOCK(txr);
+ more |= ixgbe_rxeof(que);
if (more) {
IXGBE_EVC_ADD(&que->req, 1);
if (adapter->txrx_use_workqueue) {