diff options
Diffstat (limited to 'drivers/net/virtio_net.c')
-rw-r--r-- | drivers/net/virtio_net.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 43f6523c40be..30ae6d9a12af 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -374,9 +374,9 @@ static void skb_recv_done(struct virtqueue *rvq) | |||
374 | { | 374 | { |
375 | struct virtnet_info *vi = rvq->vdev->priv; | 375 | struct virtnet_info *vi = rvq->vdev->priv; |
376 | /* Schedule NAPI, Suppress further interrupts if successful. */ | 376 | /* Schedule NAPI, Suppress further interrupts if successful. */ |
377 | if (netif_rx_schedule_prep(&vi->napi)) { | 377 | if (napi_schedule_prep(&vi->napi)) { |
378 | rvq->vq_ops->disable_cb(rvq); | 378 | rvq->vq_ops->disable_cb(rvq); |
379 | __netif_rx_schedule(&vi->napi); | 379 | __napi_schedule(&vi->napi); |
380 | } | 380 | } |
381 | } | 381 | } |
382 | 382 | ||
@@ -402,11 +402,11 @@ again: | |||
402 | 402 | ||
403 | /* Out of packets? */ | 403 | /* Out of packets? */ |
404 | if (received < budget) { | 404 | if (received < budget) { |
405 | netif_rx_complete(napi); | 405 | napi_complete(napi); |
406 | if (unlikely(!vi->rvq->vq_ops->enable_cb(vi->rvq)) | 406 | if (unlikely(!vi->rvq->vq_ops->enable_cb(vi->rvq)) |
407 | && napi_schedule_prep(napi)) { | 407 | && napi_schedule_prep(napi)) { |
408 | vi->rvq->vq_ops->disable_cb(vi->rvq); | 408 | vi->rvq->vq_ops->disable_cb(vi->rvq); |
409 | __netif_rx_schedule(napi); | 409 | __napi_schedule(napi); |
410 | goto again; | 410 | goto again; |
411 | } | 411 | } |
412 | } | 412 | } |
@@ -580,9 +580,9 @@ static int virtnet_open(struct net_device *dev) | |||
580 | * won't get another interrupt, so process any outstanding packets | 580 | * won't get another interrupt, so process any outstanding packets |
581 | * now. virtnet_poll wants re-enable the queue, so we disable here. | 581 | * now. virtnet_poll wants re-enable the queue, so we disable here. |
582 | * We synchronize against interrupts via NAPI_STATE_SCHED */ | 582 | * We synchronize against interrupts via NAPI_STATE_SCHED */ |
583 | if (netif_rx_schedule_prep(&vi->napi)) { | 583 | if (napi_schedule_prep(&vi->napi)) { |
584 | vi->rvq->vq_ops->disable_cb(vi->rvq); | 584 | vi->rvq->vq_ops->disable_cb(vi->rvq); |
585 | __netif_rx_schedule(&vi->napi); | 585 | __napi_schedule(&vi->napi); |
586 | } | 586 | } |
587 | return 0; | 587 | return 0; |
588 | } | 588 | } |