diff options
| author | Zoltan Kiss <zoltan.kiss@linaro.org> | 2014-10-28 15:29:30 +0000 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-29 15:59:37 -0400 | 
| commit | 8fe78989c3445a221cfcc54964e7e62718883615 (patch) | |
| tree | 5093098046ab0befc0f274cd80eff92d5d3cce9e /drivers/net/xen-netback/interface.c | |
| parent | 7fd2561e4ebdd070ebba6d3326c4c5b13942323f (diff) | |
| download | blackbird-op-linux-8fe78989c3445a221cfcc54964e7e62718883615.tar.gz blackbird-op-linux-8fe78989c3445a221cfcc54964e7e62718883615.zip | |
xen-netback: Disable NAPI after disabling interrupts
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>
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
| -rw-r--r-- | drivers/net/xen-netback/interface.c | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index f379689dde30..7342a6bb5557 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -281,10 +281,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);  	}  } | 

