diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2012-05-30 17:21:29 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-30 16:36:15 -0400 |
| commit | 3bbf372c6c60255585783bb08ab477a72b918196 (patch) | |
| tree | 459923eb896240212a0e7aadb10ff63467b7544f | |
| parent | 0053ea9c34a41865ec89ffbf3d3033f9a503bccc (diff) | |
| download | op-kernel-dev-3bbf372c6c60255585783bb08ab477a72b918196.zip op-kernel-dev-3bbf372c6c60255585783bb08ab477a72b918196.tar.gz | |
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>
| -rw-r--r-- | drivers/net/virtio_net.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 9ce6995..5214b1e 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -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); |
