Fri Jun 3 04:00:49 2022 UTC ()

Pull up following revision(s) (requested by msaitoh in ticket #1460):
	sys/dev/pci/ixgbe/ixgbe.c: patch
Fix previous to re-enable legacy interrupt correctly. It's a part of
ixgbe.c rev. 1.273.


(snj)

diff -r1.199.2.23 -r1.199.2.24 src/sys/dev/pci/ixgbe/ixgbe.c

--- src/sys/dev/pci/ixgbe/ixgbe.c 2022/06/02 10:45:12	1.199.2.23
+++ src/sys/dev/pci/ixgbe/ixgbe.c 2022/06/03 04:00:49	1.199.2.24

 @@ -1,14 +1,14 @@
-/* $NetBSD: ixgbe.c,v 1.199.2.23 2022/06/02 10:45:12 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.199.2.24 2022/06/03 04:00:49 snj Exp $ */
 /******************************************************************************
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
 @@ -54,27 +54,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.199.2.23 2022/06/02 10:45:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.199.2.24 2022/06/03 04:00:49 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include "ixgbe.h"
 #include "ixgbe_sriov.h"
 #include "vlan.h"
 #include <sys/cprng.h>
 #include <dev/mii/mii.h>
 @@ -6532,27 +6532,27 @@ ixgbe_handle_que(void *context)
 		    && (!ixgbe_legacy_ring_empty(ifp, NULL)))
 			ixgbe_legacy_start_locked(ifp, txr);
 		IXGBE_TX_UNLOCK(txr);
+	}
 	if (more) {
 		IXGBE_EVC_ADD(&que->req, 1);
 		ixgbe_sched_handle_que(adapter, que);
 	} else if (que->res != NULL) {
 		/* MSIX: Re-enable this interrupt */
 		ixgbe_enable_queue(adapter, que->msix);
 	} else {
 		/* INTx or MSI */
-		ixgbe_enable_intr(adapter);
+		ixgbe_enable_queue(adapter, 0);
+	}
 	return;
 } /* ixgbe_handle_que */
 /************************************************************************
  * ixgbe_handle_que_work
  ************************************************************************/
 static void
 ixgbe_handle_que_work(struct work *wk, void *context)
+{
 	struct ix_queue *que = container_of(wk, struct ix_queue, wq_cookie);