Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci/ixgbe Don't use "more" flag for simplify in ixgb...



details:   https://anonhg.NetBSD.org/src/rev/27ac3e69fcc8
branches:  trunk
changeset: 958131:27ac3e69fcc8
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sat Dec 26 06:01:22 2020 +0000

description:
Don't use "more" flag for simplify in ixgbe_legacy_irq().
No functional change intended.

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c |  19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)

diffs (54 lines):

diff -r ad7467216f0f -r 27ac3e69fcc8 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Sat Dec 26 03:54:48 2020 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Sat Dec 26 06:01:22 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.270 2020/12/24 22:36:43 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.271 2020/12/26 06:01:22 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -5156,7 +5156,6 @@
        struct ixgbe_hw *hw = &adapter->hw;
        struct ifnet    *ifp = adapter->ifp;
        struct          tx_ring *txr = adapter->tx_rings;
-       bool            more = false;
        bool            reenable_intr = true;
        u32             eicr, eicr_mask;
        u32             eims_orig;
@@ -5187,13 +5186,6 @@
                 */
                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);
 #ifdef notyet
@@ -5201,6 +5193,10 @@
                        ixgbe_start_locked(ifp, txr);
 #endif
                IXGBE_TX_UNLOCK(txr);
+
+               que->req.ev_count++;
+               ixgbe_sched_handle_que(adapter, que);
+               reenable_intr = false;
        }
 
        /* Link status change */
@@ -5242,11 +5238,6 @@
            (eicr & IXGBE_EICR_GPI_SDP0_X540))
                task_requests |= IXGBE_REQUEST_TASK_PHY;
 
-       if (more) {
-               que->req.ev_count++;
-               ixgbe_sched_handle_que(adapter, que);
-               reenable_intr = false;
-       }
        if (task_requests != 0) {
                /* Re-enabling other interrupts is done in the admin task */
                task_requests |= IXGBE_REQUEST_TASK_NEED_ACKINTR;



Home | Main Index | Thread Index | Old Index