Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6] / include / linux / virtio_config.h

diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index 70bb26062d76f43efcf9899df26c4a774417c812..d581b2914b342cbbe83744bc15762fb8718a81a3 100644 (file)
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -43,6 +43,9 @@ struct virtio_device;
  * @set_status: write the status byte
  *     vdev: the virtio_device
  *     status: the new status byte
+ * @reset: reset the device
+ *     vdev: the virtio device
+ *     After this, status and feature negotiation must be done again
  * @find_vq: find a virtqueue and instantiate it.
  *     vdev: the virtio_device
  *     index: the 0-based virtqueue number in case there's more than one.
@@ -59,9 +62,10 @@ struct virtio_config_ops
                    const void *buf, unsigned len);
        u8 (*get_status)(struct virtio_device *vdev);
        void (*set_status)(struct virtio_device *vdev, u8 status);
+       void (*reset)(struct virtio_device *vdev);
        struct virtqueue *(*find_vq)(struct virtio_device *vdev,
                                     unsigned index,
-                                    bool (*callback)(struct virtqueue *));
+                                    void (*callback)(struct virtqueue *));
        void (*del_vq)(struct virtqueue *vq);
 };