svn commit: r346335 - stable/12/sys/dev/ixgbe

[Eric Joyner]

Author: erj
Date: Wed Apr 17 22:41:27 2019
New Revision: 346335
URL: https://svnweb.freebsd.org/changeset/base/346335

Log:
  MFC r344643 and r345306
  
  Includes two ixgbe/ixv fixes:
  ixgbe(4): Fix panic triggered by assertion from interrupt
  ixv(4): Add missing IFLIB_IS_VF flag in iflib shared ctx
  
  Sponsored by:	Intel Corporation

Modified:
  stable/12/sys/dev/ixgbe/if_ix.c
  stable/12/sys/dev/ixgbe/if_ixv.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/ixgbe/if_ix.c
==============================================================================
--- stable/12/sys/dev/ixgbe/if_ix.c	Wed Apr 17 21:45:19 2019	(r346334)
+++ stable/12/sys/dev/ixgbe/if_ix.c	Wed Apr 17 22:41:27 2019	(r346335)
@@ -2064,7 +2064,7 @@ ixgbe_msix_que(void *arg)
 
 	/* Protect against spurious interrupts */
 	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
-		return 0;
+		return (FILTER_HANDLED);
 
 	ixgbe_disable_queue(adapter, que->msix);
 	++que->irqs;

Modified: stable/12/sys/dev/ixgbe/if_ixv.c
==============================================================================
--- stable/12/sys/dev/ixgbe/if_ixv.c	Wed Apr 17 21:45:19 2019	(r346334)
+++ stable/12/sys/dev/ixgbe/if_ixv.c	Wed Apr 17 22:41:27 2019	(r346335)
@@ -220,7 +220,7 @@ static struct if_shared_ctx ixv_sctx_init = {
 	.isc_vendor_info = ixv_vendor_info_array,
 	.isc_driver_version = ixv_driver_version,
 	.isc_driver = &ixv_if_driver,
-	.isc_flags = IFLIB_TSO_INIT_IP,
+	.isc_flags = IFLIB_IS_VF | IFLIB_TSO_INIT_IP,
 
 	.isc_nrxd_min = {MIN_RXD},
 	.isc_ntxd_min = {MIN_TXD},