Commit 3bbf372c authored May 30, 2012 by Michael S. Tsirkin Committed by David S. Miller May 30, 2012

virtio-net: remove useless disable on freeze



disable_cb is just an optimization: it
can not guarantee that there are no callbacks.
In particular it doesn't have any effect when
event index is on.

Instead, detach, napi disable and reset on freeze ensure we don't run
concurrently with a callback.

Remove the useless calls so we get same behaviour
with and without event index.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0053ea9c

drivers/net/virtio_net.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -1231,11 +1231,6 @@ static int virtnet_freeze(struct virtio_device *vdev)
		vi->config_enable = false;
		mutex_unlock(&vi->config_lock);

		virtqueue_disable_cb(vi->rvq);
		virtqueue_disable_cb(vi->svq);
		if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
		virtqueue_disable_cb(vi->cvq);

		netif_device_detach(vi->dev);
		cancel_delayed_work_sync(&vi->refill);

Admin message