Module Name: src
Committed By: msaitoh
Date: Sat Dec 26 06:17:55 UTC 2020
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
Don't return in the middle of ixgbe_msix_admin() when an flow director reinit
failed. NetBSD currently doesn't support flow director, so this is not a real
bug.
To generate a diff of this commit:
cvs rdiff -u -r1.274 -r1.275 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.274 src/sys/dev/pci/ixgbe/ixgbe.c:1.275
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.274 Sat Dec 26 06:10:17 2020
+++ src/sys/dev/pci/ixgbe/ixgbe.c Sat Dec 26 06:17:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.274 2020/12/26 06:10:17 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.275 2020/12/26 06:17:55 msaitoh Exp $ */
/******************************************************************************
@@ -3151,12 +3151,11 @@ ixgbe_msix_admin(void *arg)
if (adapter->hw.mac.type != ixgbe_mac_82598EB) {
if ((adapter->feat_en & IXGBE_FEATURE_FDIR) &&
(eicr & IXGBE_EICR_FLOW_DIR)) {
- /* This is probably overkill :) */
- if (!atomic_cas_uint(&adapter->fdir_reinit, 0, 1))
- return 1;
- task_requests |= IXGBE_REQUEST_TASK_FDIR;
- /* Disable the interrupt */
- eims_disable |= IXGBE_EIMS_FLOW_DIR;
+ if (!atomic_cas_uint(&adapter->fdir_reinit, 0, 1)) {
+ task_requests |= IXGBE_REQUEST_TASK_FDIR;
+ /* Disable the interrupt */
+ eims_disable |= IXGBE_EIMS_FLOW_DIR;
+ }
}
if (eicr & IXGBE_EICR_ECC) {
