mirror of https://gitee.com/openkylin/linux.git
[SCSI] qla2xxx: Set the task attributes after memsetting fcp cmnd.
The memset of the fcp_cmnd struct needs to be moved so that it will not zero-out valid data. Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
parent
58b4857696
commit
51cc9a8e5f
|
@ -2839,6 +2839,16 @@ qla82xx_start_scsi(srb_t *sp)
|
||||||
int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun);
|
int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun);
|
||||||
host_to_fcp_swap((uint8_t *)&cmd_pkt->lun, sizeof(cmd_pkt->lun));
|
host_to_fcp_swap((uint8_t *)&cmd_pkt->lun, sizeof(cmd_pkt->lun));
|
||||||
|
|
||||||
|
/* build FCP_CMND IU */
|
||||||
|
memset(ctx->fcp_cmnd, 0, sizeof(struct fcp_cmnd));
|
||||||
|
int_to_scsilun(sp->cmd->device->lun, &ctx->fcp_cmnd->lun);
|
||||||
|
ctx->fcp_cmnd->additional_cdb_len = additional_cdb_len;
|
||||||
|
|
||||||
|
if (cmd->sc_data_direction == DMA_TO_DEVICE)
|
||||||
|
ctx->fcp_cmnd->additional_cdb_len |= 1;
|
||||||
|
else if (cmd->sc_data_direction == DMA_FROM_DEVICE)
|
||||||
|
ctx->fcp_cmnd->additional_cdb_len |= 2;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Update tagged queuing modifier -- default is TSK_SIMPLE (0).
|
* Update tagged queuing modifier -- default is TSK_SIMPLE (0).
|
||||||
*/
|
*/
|
||||||
|
@ -2855,16 +2865,6 @@ qla82xx_start_scsi(srb_t *sp)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* build FCP_CMND IU */
|
|
||||||
memset(ctx->fcp_cmnd, 0, sizeof(struct fcp_cmnd));
|
|
||||||
int_to_scsilun(sp->cmd->device->lun, &ctx->fcp_cmnd->lun);
|
|
||||||
ctx->fcp_cmnd->additional_cdb_len = additional_cdb_len;
|
|
||||||
|
|
||||||
if (cmd->sc_data_direction == DMA_TO_DEVICE)
|
|
||||||
ctx->fcp_cmnd->additional_cdb_len |= 1;
|
|
||||||
else if (cmd->sc_data_direction == DMA_FROM_DEVICE)
|
|
||||||
ctx->fcp_cmnd->additional_cdb_len |= 2;
|
|
||||||
|
|
||||||
memcpy(ctx->fcp_cmnd->cdb, cmd->cmnd, cmd->cmd_len);
|
memcpy(ctx->fcp_cmnd->cdb, cmd->cmnd, cmd->cmd_len);
|
||||||
|
|
||||||
fcp_dl = (uint32_t *)(ctx->fcp_cmnd->cdb + 16 +
|
fcp_dl = (uint32_t *)(ctx->fcp_cmnd->cdb + 16 +
|
||||||
|
|
Loading…
Reference in New Issue