[src/trunk]: src/sys/dev/pci/ixgbe Don't return in the middle of ixgbe_msix_a...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1773e6ea62f9
branches:  trunk
changeset: 979359:1773e6ea62f9
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sat Dec 26 06:17:55 2020 +0000

description:
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.

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (27 lines):

diff -r aee6affa2806 -r 1773e6ea62f9 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Sat Dec 26 06:10:17 2020 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Sat Dec 26 06:17:55 2020 +0000
@@ -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 @@
        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) {