scsi: always assign block layer tags if enabled

[linux-2.6-block.git] / drivers / scsi / csiostor / csio_scsi.c

diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c
index 8231505cce0aadd109556efb1931a688847dd9cf..f73155db80a37e39f402d907b61164c210f8ed8d 100644 (file)
--- a/drivers/scsi/csiostor/csio_scsi.c
+++ b/drivers/scsi/csiostor/csio_scsi.c
@@ -2241,11 +2241,7 @@ csio_slave_alloc(struct scsi_device *sdev)
 static int
 csio_slave_configure(struct scsi_device *sdev)
 {
-       if (sdev->tagged_supported)
-               scsi_activate_tcq(sdev, csio_lun_qdepth);
-       else
-               scsi_deactivate_tcq(sdev, csio_lun_qdepth);
-
+       scsi_adjust_queue_depth(sdev, 0, csio_lun_qdepth);
        return 0;
 }
 
@@ -2290,6 +2286,7 @@ struct scsi_host_template csio_fcoe_shost_template = {
        .use_clustering         = ENABLE_CLUSTERING,
        .shost_attrs            = csio_fcoe_lport_attrs,
        .max_sectors            = CSIO_MAX_SECTOR_SIZE,
+       .use_blk_tags           = 1,
 };
 
 struct scsi_host_template csio_fcoe_shost_vport_template = {
@@ -2309,6 +2306,7 @@ struct scsi_host_template csio_fcoe_shost_vport_template = {
        .use_clustering         = ENABLE_CLUSTERING,
        .shost_attrs            = csio_fcoe_vport_attrs,
        .max_sectors            = CSIO_MAX_SECTOR_SIZE,
+       .use_blk_tags           = 1,
 };
 
 /*