diff options
author | Neil Horman <nhorman@tuxdriver.com> | 2008-12-22 23:43:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-22 23:43:12 -0500 |
commit | 908a7a16b852ffd618a9127be8d62432182d81b4 (patch) | |
tree | a0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/virtio_net.c | |
parent | 889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (diff) |
net: Remove unused netdev arg from some NAPI interfaces.
When the napi api was changed to separate its 1:1 binding to the net_device
struct, the netif_rx_[prep|schedule|complete] api failed to remove the now
vestigual net_device structure parameter. This patch cleans up that api by
properly removing it..
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 71ca29cc184d..b7004ff36451 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->dev, &vi->napi)) { | 377 | if (netif_rx_schedule_prep(&vi->napi)) { |
378 | rvq->vq_ops->disable_cb(rvq); | 378 | rvq->vq_ops->disable_cb(rvq); |
379 | __netif_rx_schedule(vi->dev, &vi->napi); | 379 | __netif_rx_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(vi->dev, napi); | 405 | netif_rx_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(vi->dev, napi); | 409 | __netif_rx_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(dev, &vi->napi)) { | 583 | if (netif_rx_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(dev, &vi->napi); | 585 | __netif_rx_schedule(&vi->napi); |
586 | } | 586 | } |
587 | return 0; | 587 | return 0; |
588 | } | 588 | } |