diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 09:57:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 09:57:13 -0800 |
| commit | aac9e28d2f3d3c1eacc4114d685864a2a6423b80 (patch) | |
| tree | 3075a2d4c70840c3b2f7173f95c0f278072db8b7 /drivers/scsi/lpfc/lpfc_scsi.c | |
| parent | 9f259cc59ba45b8db401d60be9700e275676fb15 (diff) | |
| parent | 3c887e8a1a4553ae6263fc9490e33de213e3746f (diff) | |
| download | blackbird-op-linux-aac9e28d2f3d3c1eacc4114d685864a2a6423b80.tar.gz blackbird-op-linux-aac9e28d2f3d3c1eacc4114d685864a2a6423b80.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] ibmvscsi: Prevent IO during partner login
[SCSI] lpfc : Correct queue tag handling
[SCSI] Update MAINTAINER email address and trees
[SCSI] osst: fix if (...) \n #if... cases missing semicolons when false
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_scsi.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index c0755565fae9..4e46045dea6d 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -682,6 +682,7 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd, IOCB_t *iocb_cmd = &lpfc_cmd->cur_iocbq.iocb; struct lpfc_iocbq *piocbq = &(lpfc_cmd->cur_iocbq); int datadir = scsi_cmnd->sc_data_direction; + char tag[2]; lpfc_cmd->fcp_rsp->rspSnsLen = 0; /* clear task management bits */ @@ -692,8 +693,8 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd, memcpy(&fcp_cmnd->fcpCdb[0], scsi_cmnd->cmnd, 16); - if (scsi_cmnd->device->tagged_supported) { - switch (scsi_cmnd->tag) { + if (scsi_populate_tag_msg(scsi_cmnd, tag)) { + switch (tag[0]) { case HEAD_OF_QUEUE_TAG: fcp_cmnd->fcpCntl1 = HEAD_OF_Q; break; |
