diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2014-10-14 19:52:32 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2014-10-14 19:55:10 -0400 |
commit | e53fbd11e983e896adaabef2d2f1695d6e0af829 (patch) | |
tree | 244d1ca5e77124d98f3b7a962b9185605bec5533 /drivers/net | |
parent | 401bbdc901b268113d7c562616feb7fc37492aca (diff) |
virtio_net: enable VQs early on restore
virtio spec requires drivers to set DRIVER_OK before using VQs.
This is set automatically after restore returns, virtio net violated this
rule by using receive VQs within restore.
To fix, call virtio_device_ready before using VQs.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/virtio_net.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 53031e58a5fc..4e0cbbcd60a7 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -1912,6 +1912,8 @@ static int virtnet_restore(struct virtio_device *vdev) | |||
1912 | if (err) | 1912 | if (err) |
1913 | return err; | 1913 | return err; |
1914 | 1914 | ||
1915 | virtio_device_ready(vdev); | ||
1916 | |||
1915 | if (netif_running(vi->dev)) { | 1917 | if (netif_running(vi->dev)) { |
1916 | for (i = 0; i < vi->curr_queue_pairs; i++) | 1918 | for (i = 0; i < vi->curr_queue_pairs; i++) |
1917 | if (!try_fill_recv(&vi->rq[i], GFP_KERNEL)) | 1919 | if (!try_fill_recv(&vi->rq[i], GFP_KERNEL)) |