]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
r8169: change irq handler to always trigger NAPI polling
authorHeiner Kallweit <hkallweit1@gmail.com>
Sun, 14 Apr 2019 09:48:39 +0000 (11:48 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 14 Apr 2019 20:58:15 +0000 (13:58 -0700)
This check isn't really needed and we can simplify the code and save
some CPU cycles by removing it. Only in case of an error none of these
bits are set, and calling the NAPI callback doesn't hurt in this case.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/realtek/r8169.c

index 68caa26f0c3ee1c586e23bd2e4cebe2296e9ec96..efaea1a0ad64fb0fdabe9ed4be5ea0c07eb5f59c 100644 (file)
@@ -6380,10 +6380,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
                set_bit(RTL_FLAG_TASK_RESET_PENDING, tp->wk.flags);
        }
 
-       if (status & (RTL_EVENT_NAPI | LinkChg)) {
-               rtl_irq_disable(tp);
-               napi_schedule_irqoff(&tp->napi);
-       }
+       rtl_irq_disable(tp);
+       napi_schedule_irqoff(&tp->napi);
 out:
        rtl_ack_events(tp, status);