Module Name: src
Committed By: msaitoh
Date: Wed Jun 1 02:07:24 UTC 2022
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
Simplify ixgbe_msix_que(). No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.315 src/sys/dev/pci/ixgbe/ixgbe.c:1.316
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.315 Mon May 30 05:07:38 2022
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Jun 1 02:07:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.315 2022/05/30 05:07:38 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.316 2022/06/01 02:07:24 msaitoh Exp $ */
/******************************************************************************
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.315 2022/05/30 05:07:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.316 2022/06/01 02:07:24 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2799,7 +2799,6 @@ ixgbe_msix_que(void *arg)
struct ifnet *ifp = adapter->ifp;
struct tx_ring *txr = que->txr;
struct rx_ring *rxr = que->rxr;
- bool more;
u32 newitr = 0;
/* Protect against spurious interrupts */
@@ -2815,13 +2814,6 @@ ixgbe_msix_que(void *arg)
*/
que->txrx_use_workqueue = adapter->txrx_use_workqueue;
-#ifdef __NetBSD__
- /* Don't run ixgbe_rxeof in interrupt context */
- more = true;
-#else
- more = ixgbe_rxeof(que);
-#endif
-
IXGBE_TX_LOCK(txr);
ixgbe_txeof(txr);
IXGBE_TX_UNLOCK(txr);
@@ -2882,10 +2874,7 @@ ixgbe_msix_que(void *arg)
rxr->packets = 0;
no_calc:
- if (more)
- ixgbe_sched_handle_que(adapter, que);
- else
- ixgbe_enable_queue(adapter, que->msix);
+ ixgbe_sched_handle_que(adapter, que);
return 1;
} /* ixgbe_msix_que */
