Merge remote-tracking branch 'scsi-queue/core-for-3.19' into for-linus

[cascardo/linux.git] / drivers / scsi / qla4xxx / ql4_iocb.c

diff --git a/drivers/scsi/qla4xxx/ql4_iocb.c b/drivers/scsi/qla4xxx/ql4_iocb.c
index 08ab6da..17222eb 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_iocb.c
+++ b/drivers/scsi/qla4xxx/ql4_iocb.c
@@ -280,7 +280,6 @@ int qla4xxx_send_command_to_isp(struct scsi_qla_host *ha, struct srb * srb)
        uint16_t req_cnt;
        unsigned long flags;
        uint32_t index;
-       char tag[2];
 
        /* Get real lun and adapter */
        ddb_entry = srb->ddb;
@@ -352,15 +351,6 @@ int qla4xxx_send_command_to_isp(struct scsi_qla_host *ha, struct srb * srb)
 
        /* Set tagged queueing control flags */
        cmd_entry->control_flags |= CF_SIMPLE_TAG;
-       if (scsi_populate_tag_msg(cmd, tag))
-               switch (tag[0]) {
-               case MSG_HEAD_TAG:
-                       cmd_entry->control_flags |= CF_HEAD_TAG;
-                       break;
-               case MSG_ORDERED_TAG:
-                       cmd_entry->control_flags |= CF_ORDERED_TAG;
-                       break;
-               }
 
        qla4xxx_advance_req_ring_ptr(ha);
        qla4xxx_build_scsi_iocbs(srb, cmd_entry, tot_dsds);