scsi: always assign block layer tags if enabled

[mirror_ubuntu-artful-kernel.git] / drivers / scsi / bfa / bfad_im.c

diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index 99280e89c2893b9930b56d43b741eb2aa64c4296..d8e43c81d19bc7742380d45f109a05e76dcfcac8 100644 (file)
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -776,11 +776,7 @@ bfad_thread_workq(struct bfad_s *bfad)
 static int
 bfad_im_slave_configure(struct scsi_device *sdev)
 {
-       if (sdev->tagged_supported)
-               scsi_activate_tcq(sdev, bfa_lun_queue_depth);
-       else
-               scsi_deactivate_tcq(sdev, bfa_lun_queue_depth);
-
+       scsi_adjust_queue_depth(sdev, 0, bfa_lun_queue_depth);
        return 0;
 }
 
@@ -804,6 +800,7 @@ struct scsi_host_template bfad_im_scsi_host_template = {
        .shost_attrs = bfad_im_host_attrs,
        .max_sectors = BFAD_MAX_SECTORS,
        .vendor_id = BFA_PCI_VENDOR_ID_BROCADE,
+       .use_blk_tags = 1,
 };
 
 struct scsi_host_template bfad_im_vport_template = {
@@ -825,6 +822,7 @@ struct scsi_host_template bfad_im_vport_template = {
        .use_clustering = ENABLE_CLUSTERING,
        .shost_attrs = bfad_im_vport_attrs,
        .max_sectors = BFAD_MAX_SECTORS,
+       .use_blk_tags = 1,
 };
 
 bfa_status_t