]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
fm10k: use napi_schedule_irqoff()
authorAlexander Duyck <aduyck@mirantis.com>
Tue, 29 Sep 2015 22:19:56 +0000 (15:19 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Sun, 26 Feb 2017 06:03:22 +0000 (22:03 -0800)
The fm10k_msix_clean_rings function runs from hard interrupt context or
with interrupts already disabled in netpoll.

It can use napi_schedule_irqoff() instead of napi_schedule()

Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Orabug: 25394529
(cherry picked from commit de125aaecf3f06984dd32335f1e6a41c80b71011)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
drivers/net/ethernet/intel/fm10k/fm10k_pci.c

index a9a6b14482199be6a6326104a1463a342f1774d5..0e72cfe8cbafb19a0cd701bcf666db8a8e70f1ac 100644 (file)
@@ -846,7 +846,7 @@ static irqreturn_t fm10k_msix_clean_rings(int __always_unused irq, void *data)
        struct fm10k_q_vector *q_vector = data;
 
        if (q_vector->rx.count || q_vector->tx.count)
-               napi_schedule(&q_vector->napi);
+               napi_schedule_irqoff(&q_vector->napi);
 
        return IRQ_HANDLED;
 }