Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[linux-2.6-microblaze.git] / include / scsi / scsi_host.h

diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 46ef8cc..701f178 100644 (file)
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -436,6 +436,9 @@ struct scsi_host_template {
        /* True if the controller does not support WRITE SAME */
        unsigned no_write_same:1;
 
+       /* True if the host uses host-wide tagspace */
+       unsigned host_tagset:1;
+
        /*
         * Countdown for host blocking with no commands outstanding.
         */
@@ -603,7 +606,8 @@ struct Scsi_Host {
         *
         * Note: it is assumed that each hardware queue has a queue depth of
         * can_queue. In other words, the total queue depth per host
-        * is nr_hw_queues * can_queue.
+        * is nr_hw_queues * can_queue. However, for when host_tagset is set,
+        * the total queue depth is can_queue.
         */
        unsigned nr_hw_queues;
        unsigned active_mode:2;
@@ -634,6 +638,9 @@ struct Scsi_Host {
        /* The controller does not support WRITE SAME */
        unsigned no_write_same:1;
 
+       /* True if the host uses host-wide tagspace */
+       unsigned host_tagset:1;
+
        /* Host responded with short (<36 bytes) INQUIRY result */
        unsigned short_inquiry:1;