diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-28 06:12:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-28 06:12:38 -0800 |
| commit | 05ba712d7eb156009753e18e5116cabd869cc6e2 (patch) | |
| tree | 1ad850d6889f6b3671a5636653940f20a7d22bdf /drivers/net/virtio_net.c | |
| parent | 257ddbdad13cd3c4f7d03b85af632c508aa8abc9 (diff) | |
| parent | b473946a0853860e13b51c28add5524741117786 (diff) | |
| download | linux-stable-05ba712d7eb156009753e18e5116cabd869cc6e2.tar.gz linux-stable-05ba712d7eb156009753e18e5116cabd869cc6e2.tar.bz2 linux-stable-05ba712d7eb156009753e18e5116cabd869cc6e2.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 088332a943f7..6b92e383c653 100644 --- a/drivers/net/virtio_net.c +++ b/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 |