1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/net/ethernet/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c
index 0b7880b0b8fc..b4e91edec0fa 100644
--- a/drivers/net/ethernet/sfc/falcon.c
+++ b/drivers/net/ethernet/sfc/falcon.c
@@ -174,19 +174,16 @@ irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id)
                    "IRQ %d on CPU %d status " EFX_OWORD_FMT "\n",
                    irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker));
 
+        /* Check to see if we have a serious error condition */
+        syserr = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_FATAL_INT);
+        if (unlikely(syserr))
+                return efx_nic_fatal_interrupt(efx);
+
         /* Determine interrupting queues, clear interrupt status
          * register and acknowledge the device interrupt.
          */
         BUILD_BUG_ON(FSF_AZ_NET_IVEC_INT_Q_WIDTH > EFX_MAX_CHANNELS);
         queues = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_INT_Q);
-
-        /* Check to see if we have a serious error condition */
-        if (queues & (1U << efx->fatal_irq_level)) {
-                syserr = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_FATAL_INT);
-                if (unlikely(syserr))
-                        return efx_nic_fatal_interrupt(efx);
-        }
-
         EFX_ZERO_OWORD(*int_ker);
         wmb(); /* Ensure the vector is cleared before interrupt ack */
         falcon_irq_ack_a1(efx);