diff options
Diffstat (limited to 'drivers/net/virtio_net.c')
-rw-r--r-- | drivers/net/virtio_net.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 83d2b0c34c5..9650c413e11 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -521,7 +521,7 @@ static void refill_work(struct work_struct *work) | |||
521 | /* In theory, this can happen: if we don't get any buffers in | 521 | /* In theory, this can happen: if we don't get any buffers in |
522 | * we will *never* try to fill again. */ | 522 | * we will *never* try to fill again. */ |
523 | if (still_empty) | 523 | if (still_empty) |
524 | queue_delayed_work(system_nrt_wq, &vi->refill, HZ/2); | 524 | schedule_delayed_work(&vi->refill, HZ/2); |
525 | } | 525 | } |
526 | 526 | ||
527 | static int virtnet_poll(struct napi_struct *napi, int budget) | 527 | static int virtnet_poll(struct napi_struct *napi, int budget) |
@@ -540,7 +540,7 @@ again: | |||
540 | 540 | ||
541 | if (vi->num < vi->max / 2) { | 541 | if (vi->num < vi->max / 2) { |
542 | if (!try_fill_recv(vi, GFP_ATOMIC)) | 542 | if (!try_fill_recv(vi, GFP_ATOMIC)) |
543 | queue_delayed_work(system_nrt_wq, &vi->refill, 0); | 543 | schedule_delayed_work(&vi->refill, 0); |
544 | } | 544 | } |
545 | 545 | ||
546 | /* Out of packets? */ | 546 | /* Out of packets? */ |
@@ -745,7 +745,7 @@ static int virtnet_open(struct net_device *dev) | |||
745 | 745 | ||
746 | /* Make sure we have some buffers: if oom use wq. */ | 746 | /* Make sure we have some buffers: if oom use wq. */ |
747 | if (!try_fill_recv(vi, GFP_KERNEL)) | 747 | if (!try_fill_recv(vi, GFP_KERNEL)) |
748 | queue_delayed_work(system_nrt_wq, &vi->refill, 0); | 748 | schedule_delayed_work(&vi->refill, 0); |
749 | 749 | ||
750 | virtnet_napi_enable(vi); | 750 | virtnet_napi_enable(vi); |
751 | return 0; | 751 | return 0; |
@@ -1020,7 +1020,7 @@ static void virtnet_config_changed(struct virtio_device *vdev) | |||
1020 | { | 1020 | { |
1021 | struct virtnet_info *vi = vdev->priv; | 1021 | struct virtnet_info *vi = vdev->priv; |
1022 | 1022 | ||
1023 | queue_work(system_nrt_wq, &vi->config_work); | 1023 | schedule_work(&vi->config_work); |
1024 | } | 1024 | } |
1025 | 1025 | ||
1026 | static int init_vqs(struct virtnet_info *vi) | 1026 | static int init_vqs(struct virtnet_info *vi) |
@@ -1152,7 +1152,7 @@ static int virtnet_probe(struct virtio_device *vdev) | |||
1152 | otherwise get link status from config. */ | 1152 | otherwise get link status from config. */ |
1153 | if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) { | 1153 | if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) { |
1154 | netif_carrier_off(dev); | 1154 | netif_carrier_off(dev); |
1155 | queue_work(system_nrt_wq, &vi->config_work); | 1155 | schedule_work(&vi->config_work); |
1156 | } else { | 1156 | } else { |
1157 | vi->status = VIRTIO_NET_S_LINK_UP; | 1157 | vi->status = VIRTIO_NET_S_LINK_UP; |
1158 | netif_carrier_on(dev); | 1158 | netif_carrier_on(dev); |
@@ -1264,7 +1264,7 @@ static int virtnet_restore(struct virtio_device *vdev) | |||
1264 | netif_device_attach(vi->dev); | 1264 | netif_device_attach(vi->dev); |
1265 | 1265 | ||
1266 | if (!try_fill_recv(vi, GFP_KERNEL)) | 1266 | if (!try_fill_recv(vi, GFP_KERNEL)) |
1267 | queue_delayed_work(system_nrt_wq, &vi->refill, 0); | 1267 | schedule_delayed_work(&vi->refill, 0); |
1268 | 1268 | ||
1269 | mutex_lock(&vi->config_lock); | 1269 | mutex_lock(&vi->config_lock); |
1270 | vi->config_enable = true; | 1270 | vi->config_enable = true; |