|
@@ -602,7 +602,7 @@ static int virtnet_poll(struct napi_struct *napi, int budget)
|
|
container_of(napi, struct receive_queue, napi);
|
|
container_of(napi, struct receive_queue, napi);
|
|
struct virtnet_info *vi = rq->vq->vdev->priv;
|
|
struct virtnet_info *vi = rq->vq->vdev->priv;
|
|
void *buf;
|
|
void *buf;
|
|
- unsigned int len, received = 0;
|
|
|
|
|
|
+ unsigned int r, len, received = 0;
|
|
|
|
|
|
again:
|
|
again:
|
|
while (received < budget &&
|
|
while (received < budget &&
|
|
@@ -619,8 +619,9 @@ again:
|
|
|
|
|
|
/* Out of packets? */
|
|
/* Out of packets? */
|
|
if (received < budget) {
|
|
if (received < budget) {
|
|
|
|
+ r = virtqueue_enable_cb_prepare(rq->vq);
|
|
napi_complete(napi);
|
|
napi_complete(napi);
|
|
- if (unlikely(!virtqueue_enable_cb(rq->vq)) &&
|
|
|
|
|
|
+ if (unlikely(virtqueue_poll(rq->vq, r)) &&
|
|
napi_schedule_prep(napi)) {
|
|
napi_schedule_prep(napi)) {
|
|
virtqueue_disable_cb(rq->vq);
|
|
virtqueue_disable_cb(rq->vq);
|
|
__napi_schedule(napi);
|
|
__napi_schedule(napi);
|