virtio-net: introduce virtnet_receive()

Move common receive logic to a new helper virtnet_receive(). It will
also be used by rx busy polling method.

Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Vlad Yasevich <vyasevic@redhat.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 7d9f84a91f37dd96fbd835d170dc8ed24c281b6c..b647d0d5c00e967cbb4ed00005e065187ab49836 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -725,15 +725,12 @@ static void refill_work(struct work_struct *work)
        }
 }
 
-static int virtnet_poll(struct napi_struct *napi, int budget)
+static int virtnet_receive(struct receive_queue *rq, int budget)
 {
-       struct receive_queue *rq =
-               container_of(napi, struct receive_queue, napi);
        struct virtnet_info *vi = rq->vq->vdev->priv;
+       unsigned int len, received = 0;
        void *buf;
-       unsigned int r, len, received = 0;
 
-again:
        while (received < budget &&
               (buf = virtqueue_get_buf(rq->vq, &len)) != NULL) {
                receive_buf(rq, buf, len);
@@ -745,6 +742,18 @@ again:
                        schedule_delayed_work(&vi->refill, 0);
        }
 
+       return received;
+}
+
+static int virtnet_poll(struct napi_struct *napi, int budget)
+{
+       struct receive_queue *rq =
+               container_of(napi, struct receive_queue, napi);
+       unsigned int r, received = 0;
+
+again:
+       received += virtnet_receive(rq, budget - received);
+
        /* Out of packets? */
        if (received < budget) {
                r = virtqueue_enable_cb_prepare(rq->vq);