Module Name:    src
Committed By:   msaitoh
Date:           Thu Mar 10 04:00:32 UTC 2022

Modified Files:
        src/sys/dev/pci/ixgbe: ixgbe.c

Log Message:
 Enclose flow director stuff in ixgbe_intr_admin_common() with IXGBE_FIR.


To generate a diff of this commit:
cvs rdiff -u -r1.310 -r1.311 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.310 src/sys/dev/pci/ixgbe/ixgbe.c:1.311
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.310	Thu Mar 10 03:58:52 2022
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Thu Mar 10 04:00:32 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.310 2022/03/10 03:58:52 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.311 2022/03/10 04:00:32 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.310 2022/03/10 03:58:52 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.311 2022/03/10 04:00:32 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -3218,6 +3218,7 @@ ixgbe_intr_admin_common(struct adapter *
 	}
 
 	if (adapter->hw.mac.type != ixgbe_mac_82598EB) {
+#ifdef IXGBE_FDIR
 		if ((adapter->feat_en & IXGBE_FEATURE_FDIR) &&
 		    (eicr & IXGBE_EICR_FLOW_DIR)) {
 			if (!atomic_cas_uint(&adapter->fdir_reinit, 0, 1)) {
@@ -3226,6 +3227,7 @@ ixgbe_intr_admin_common(struct adapter *
 				*eims_disable |= IXGBE_EIMS_FLOW_DIR;
 			}
 		}
+#endif
 
 		if (eicr & IXGBE_EICR_ECC) {
 			device_printf(adapter->dev,

Reply via email to