From 0a31e3f819febded00c0c76ee62301ca9c49328e Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 29 Dec 2011 00:43:15 +0000 Subject: [PATCH] --- yaml --- r: 279129 b: refs/heads/master c: f1776dade17cd54562f4bc1d01de89c4908b4dd0 h: refs/heads/master i: 279127: cbaf2f619a1d88ab521a1848f89f7e7f0ee4f60e v: v3 --- [refs] | 2 +- trunk/drivers/net/virtio_net.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 94af12d61243..65be461d34b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2baed69e605c3e57d28940cc7aaae908d61f769 +refs/heads/master: f1776dade17cd54562f4bc1d01de89c4908b4dd0 diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c index 07ca150a5ca6..2055386eda58 100644 --- a/trunk/drivers/net/virtio_net.c +++ b/trunk/drivers/net/virtio_net.c @@ -508,7 +508,7 @@ static void refill_work(struct work_struct *work) /* In theory, this can happen: if we don't get any buffers in * we will *never* try to fill again. */ if (still_empty) - schedule_delayed_work(&vi->refill, HZ/2); + queue_delayed_work(system_nrt_wq, &vi->refill, HZ/2); } static int virtnet_poll(struct napi_struct *napi, int budget) @@ -527,7 +527,7 @@ static int virtnet_poll(struct napi_struct *napi, int budget) if (vi->num < vi->max / 2) { if (!try_fill_recv(vi, GFP_ATOMIC)) - schedule_delayed_work(&vi->refill, 0); + queue_delayed_work(system_nrt_wq, &vi->refill, 0); } /* Out of packets? */ @@ -729,7 +729,7 @@ static int virtnet_open(struct net_device *dev) /* Make sure we have some buffers: if oom use wq. */ if (!try_fill_recv(vi, GFP_KERNEL)) - schedule_delayed_work(&vi->refill, 0); + queue_delayed_work(system_nrt_wq, &vi->refill, 0); virtnet_napi_enable(vi); return 0;