Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...

[karo-tx-linux.git] / drivers / target / iscsi / iscsi_target.c

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index f8ec32298906609d9cf270508190df748cbdba49..55f6774f706f729b92fb2045abb7f9a33740c2b4 100644 (file)
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -944,17 +944,17 @@ int iscsit_setup_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
         */
        if ((iscsi_task_attr == ISCSI_ATTR_UNTAGGED) ||
            (iscsi_task_attr == ISCSI_ATTR_SIMPLE))
-               sam_task_attr = MSG_SIMPLE_TAG;
+               sam_task_attr = TCM_SIMPLE_TAG;
        else if (iscsi_task_attr == ISCSI_ATTR_ORDERED)
-               sam_task_attr = MSG_ORDERED_TAG;
+               sam_task_attr = TCM_ORDERED_TAG;
        else if (iscsi_task_attr == ISCSI_ATTR_HEAD_OF_QUEUE)
-               sam_task_attr = MSG_HEAD_TAG;
+               sam_task_attr = TCM_HEAD_TAG;
        else if (iscsi_task_attr == ISCSI_ATTR_ACA)
-               sam_task_attr = MSG_ACA_TAG;
+               sam_task_attr = TCM_ACA_TAG;
        else {
                pr_debug("Unknown iSCSI Task Attribute: 0x%02x, using"
-                       " MSG_SIMPLE_TAG\n", iscsi_task_attr);
-               sam_task_attr = MSG_SIMPLE_TAG;
+                       " TCM_SIMPLE_TAG\n", iscsi_task_attr);
+               sam_task_attr = TCM_SIMPLE_TAG;
        }
 
        cmd->iscsi_opcode       = ISCSI_OP_SCSI_CMD;
@@ -1812,7 +1812,7 @@ iscsit_handle_task_mgt_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
                transport_init_se_cmd(&cmd->se_cmd,
                                      &lio_target_fabric_configfs->tf_ops,
                                      conn->sess->se_sess, 0, DMA_NONE,
-                                     MSG_SIMPLE_TAG, cmd->sense_buffer + 2);
+                                     TCM_SIMPLE_TAG, cmd->sense_buffer + 2);
 
                target_get_sess_cmd(conn->sess->se_sess, &cmd->se_cmd, true);
                sess_ref = true;