summaryrefslogtreecommitdiff
path: root/drivers/scsi/csiostor
diff options
context:
space:
mode:
authorJames Bottomley <JBottomley@Parallels.com>2014-12-18 16:56:29 +0300
committerJames Bottomley <JBottomley@Parallels.com>2014-12-18 16:56:29 +0300
commite61745769125a3c788e7aceb2a5fb680ebb461e6 (patch)
treec8219c31767c8d6a64938626dd93069847d1d5b8 /drivers/scsi/csiostor
parent198a956a11b15b564ac06d1411881e215b587408 (diff)
parente86fb5e8ab95f10ec5f2e9430119d5d35020c951 (diff)
downloadlinux-e61745769125a3c788e7aceb2a5fb680ebb461e6.tar.xz
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Diffstat (limited to 'drivers/scsi/csiostor')
-rw-r--r--drivers/scsi/csiostor/csio_scsi.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c
index 51ea5dc5f084..3987284e0d2a 100644
--- a/drivers/scsi/csiostor/csio_scsi.c
+++ b/drivers/scsi/csiostor/csio_scsi.c
@@ -172,10 +172,7 @@ csio_scsi_fcp_cmnd(struct csio_ioreq *req, void *addr)
fcp_cmnd->fc_cmdref = 0;
memcpy(fcp_cmnd->fc_cdb, scmnd->cmnd, 16);
- if (scmnd->flags & SCMD_TAGGED)
- fcp_cmnd->fc_pri_ta = FCP_PTA_SIMPLE;
- else
- fcp_cmnd->fc_pri_ta = 0;
+ fcp_cmnd->fc_pri_ta = FCP_PTA_SIMPLE;
fcp_cmnd->fc_dl = cpu_to_be32(scsi_bufflen(scmnd));
if (req->nsge)