From 221d5593b93bef09ad57beb75dde1600581fdb40 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Mon, 25 Jan 2010 15:51:01 -0800 Subject: [PATCH] --- yaml --- r: 179825 b: refs/heads/master c: 39d321577405e8e269fd238b278aaf2425fa788a h: refs/heads/master i: 179823: 1cc2346dbc517d1298bad1061b152232b173b294 v: v3 --- [refs] | 2 +- trunk/drivers/net/virtio_net.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 71379e51ec43..cd10ce5c7b0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a27e86babe79cf5f575394bb1055448458df6c7 +refs/heads/master: 39d321577405e8e269fd238b278aaf2425fa788a diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c index c708ecc3cb2e..9ead30bd00c4 100644 --- a/trunk/drivers/net/virtio_net.c +++ b/trunk/drivers/net/virtio_net.c @@ -395,8 +395,7 @@ static void refill_work(struct work_struct *work) vi = container_of(work, struct virtnet_info, refill.work); napi_disable(&vi->napi); - try_fill_recv(vi, GFP_KERNEL); - still_empty = (vi->num == 0); + still_empty = !try_fill_recv(vi, GFP_KERNEL); napi_enable(&vi->napi); /* In theory, this can happen: if we don't get any buffers in