mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
xen-netback: move NAPI add/remove calls
Originally netif_napi_add was in xenvif_init_queue and netif_napi_del was in xenvif_deinit_queue, while kthreads were handled in xenvif_connect and xenvif_disconnect. Move netif_napi_add and netif_napi_del to xenvif_connect and xenvif_disconnect so that they reside together with kthread operations. Signed-off-by: Wei Liu <wei.liu2@citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Zoltan Kiss <zoltan.kiss@citrix.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
6880995871
commit
ea2c5e1342
1 changed files with 5 additions and 4 deletions
|
@ -524,9 +524,6 @@ int xenvif_init_queue(struct xenvif_queue *queue)
|
|||
|
||||
init_timer(&queue->rx_stalled);
|
||||
|
||||
netif_napi_add(queue->vif->dev, &queue->napi, xenvif_poll,
|
||||
XENVIF_NAPI_WEIGHT);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -614,6 +611,9 @@ int xenvif_connect(struct xenvif_queue *queue, unsigned long tx_ring_ref,
|
|||
wake_up_process(queue->task);
|
||||
wake_up_process(queue->dealloc_task);
|
||||
|
||||
netif_napi_add(queue->vif->dev, &queue->napi, xenvif_poll,
|
||||
XENVIF_NAPI_WEIGHT);
|
||||
|
||||
return 0;
|
||||
|
||||
err_rx_unbind:
|
||||
|
@ -672,6 +672,8 @@ void xenvif_disconnect(struct xenvif *vif)
|
|||
for (queue_index = 0; queue_index < num_queues; ++queue_index) {
|
||||
queue = &vif->queues[queue_index];
|
||||
|
||||
netif_napi_del(&queue->napi);
|
||||
|
||||
if (queue->task) {
|
||||
del_timer_sync(&queue->rx_stalled);
|
||||
kthread_stop(queue->task);
|
||||
|
@ -704,7 +706,6 @@ void xenvif_disconnect(struct xenvif *vif)
|
|||
void xenvif_deinit_queue(struct xenvif_queue *queue)
|
||||
{
|
||||
free_xenballooned_pages(MAX_PENDING_REQS, queue->mmap_pages);
|
||||
netif_napi_del(&queue->napi);
|
||||
}
|
||||
|
||||
void xenvif_free(struct xenvif *vif)
|
||||
|
|
Loading…
Reference in a new issue