diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-08 02:55:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-08 02:55:46 -0500 |
| commit | 6d3e0907b8b239d16720d144e2675ecf10d3bc3b (patch) | |
| tree | e0b0743b5f6f82b057cafc4f3687396a6e01a0b4 /drivers/net/virtio_net.c | |
| parent | 23577256953c870de9b724c3a2611ce7be6a1e4e (diff) | |
| parent | 50200df462023b187d80a99a52f5f2cfe3c86c26 (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge reason: Merge dependent fix, update to latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 c708ecc3cb2e..9ead30bd00c4 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) | |||
| 395 | 395 | ||
| 396 | vi = container_of(work, struct virtnet_info, refill.work); | 396 | vi = container_of(work, struct virtnet_info, refill.work); |
| 397 | napi_disable(&vi->napi); | 397 | napi_disable(&vi->napi); |
| 398 | try_fill_recv(vi, GFP_KERNEL); | 398 | still_empty = !try_fill_recv(vi, GFP_KERNEL); |
| 399 | still_empty = (vi->num == 0); | ||
| 400 | napi_enable(&vi->napi); | 399 | napi_enable(&vi->napi); |
| 401 | 400 | ||
| 402 | /* In theory, this can happen: if we don't get any buffers in | 401 | /* In theory, this can happen: if we don't get any buffers in |