39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From bafb73e2d50d3addd0f79e09ea3f2e2950505733 Mon Sep 17 00:00:00 2001
|
|
From: Zoltan Kiss <zoltan.kiss@linaro.org>
|
|
Date: Tue, 28 Oct 2014 15:29:30 +0000
|
|
Subject: [PATCH 1/4] xen-netback: Disable NAPI after disabling interrupts
|
|
Origin: https://git.kernel.org/linus/8fe78989c3445a221cfcc54964e7e62718883615
|
|
|
|
Otherwise the interrupt handler still calls napi_complete. Although it
|
|
won't schedule NAPI again as either NAPI_STATE_DISABLE or
|
|
NAPI_STATE_SCHED is set, it is just unnecessary, and it makes more
|
|
sense to do this way.
|
|
|
|
Signed-off-by: Zoltan Kiss <zoltan.kiss@linaro.org>
|
|
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
|
|
Acked-by: Wei Liu <wei.liu2@citrix.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/xen-netback/interface.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
|
|
index 21d8db8..ddcb757 100644
|
|
--- a/drivers/net/xen-netback/interface.c
|
|
+++ b/drivers/net/xen-netback/interface.c
|
|
@@ -235,10 +235,10 @@ static void xenvif_down(struct xenvif *vif)
|
|
|
|
for (queue_index = 0; queue_index < num_queues; ++queue_index) {
|
|
queue = &vif->queues[queue_index];
|
|
- napi_disable(&queue->napi);
|
|
disable_irq(queue->tx_irq);
|
|
if (queue->tx_irq != queue->rx_irq)
|
|
disable_irq(queue->rx_irq);
|
|
+ napi_disable(&queue->napi);
|
|
del_timer_sync(&queue->credit_timeout);
|
|
}
|
|
}
|
|
--
|
|
1.7.10.4
|
|
|