diff options
| author | Jens Axboe <axboe@fb.com> | 2015-01-02 15:03:42 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-01-02 15:03:42 -0700 |
| commit | 5d7bf4d8f664468223846abcfc683f4694014074 (patch) | |
| tree | 942496e8b6b6753502bcdbc513f0547c80af3d30 /drivers/target/tcm_fc | |
| parent | 35b489d32fcc37e8735f41aa794b24cf9d1e74f5 (diff) | |
| parent | b7392d2247cfe6771f95d256374f1a8e6a6f48d6 (diff) | |
Merge tag 'v3.19-rc2' into for-3.20/core
Linux 3.19-rc2
Diffstat (limited to 'drivers/target/tcm_fc')
| -rw-r--r-- | drivers/target/tcm_fc/tfc_cmd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c index be0c0d08c56a..edcafa4490c0 100644 --- a/drivers/target/tcm_fc/tfc_cmd.c +++ b/drivers/target/tcm_fc/tfc_cmd.c @@ -554,17 +554,17 @@ static void ft_send_work(struct work_struct *work) */ switch (fcp->fc_pri_ta & FCP_PTA_MASK) { case FCP_PTA_HEADQ: - task_attr = MSG_HEAD_TAG; + task_attr = TCM_HEAD_TAG; break; case FCP_PTA_ORDERED: - task_attr = MSG_ORDERED_TAG; + task_attr = TCM_ORDERED_TAG; break; case FCP_PTA_ACA: - task_attr = MSG_ACA_TAG; + task_attr = TCM_ACA_TAG; break; case FCP_PTA_SIMPLE: /* Fallthrough */ default: - task_attr = MSG_SIMPLE_TAG; + task_attr = TCM_SIMPLE_TAG; } fc_seq_exch(cmd->seq)->lp->tt.seq_set_resp(cmd->seq, ft_recv_seq, cmd); |