aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx/qla_target.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_target.c')
-rw-r--r--drivers/scsi/qla2xxx/qla_target.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index b1d10f9935c7..2619ed45cbdc 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1997,7 +1997,7 @@ qlt_set_t10dif_tags(struct se_cmd *se_cmd, struct crc_context *ctx)
1997 * have been immplemented by TCM, before AppTag is avail. 1997 * have been immplemented by TCM, before AppTag is avail.
1998 * Look for modesense_handlers[] 1998 * Look for modesense_handlers[]
1999 */ 1999 */
2000 ctx->app_tag = __constant_cpu_to_le16(0); 2000 ctx->app_tag = 0;
2001 ctx->app_tag_mask[0] = 0x0; 2001 ctx->app_tag_mask[0] = 0x0;
2002 ctx->app_tag_mask[1] = 0x0; 2002 ctx->app_tag_mask[1] = 0x0;
2003 2003
@@ -2079,6 +2079,7 @@ qlt_build_ctio_crc2_pkt(struct qla_tgt_prm *prm, scsi_qla_host_t *vha)
2079 struct se_cmd *se_cmd = &cmd->se_cmd; 2079 struct se_cmd *se_cmd = &cmd->se_cmd;
2080 uint32_t h; 2080 uint32_t h;
2081 struct atio_from_isp *atio = &prm->cmd->atio; 2081 struct atio_from_isp *atio = &prm->cmd->atio;
2082 uint16_t t16;
2082 2083
2083 sgc = 0; 2084 sgc = 0;
2084 ha = vha->hw; 2085 ha = vha->hw;
@@ -2175,8 +2176,13 @@ qlt_build_ctio_crc2_pkt(struct qla_tgt_prm *prm, scsi_qla_host_t *vha)
2175 pkt->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1]; 2176 pkt->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];
2176 pkt->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0]; 2177 pkt->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];
2177 pkt->exchange_addr = atio->u.isp24.exchange_addr; 2178 pkt->exchange_addr = atio->u.isp24.exchange_addr;
2178 pkt->ox_id = swab16(atio->u.isp24.fcp_hdr.ox_id); 2179
2179 pkt->flags |= (atio->u.isp24.attr << 9); 2180 /* silence compile warning */
2181 t16 = be16_to_cpu(atio->u.isp24.fcp_hdr.ox_id);
2182 pkt->ox_id = cpu_to_le16(t16);
2183
2184 t16 = (atio->u.isp24.attr << 9);
2185 pkt->flags |= cpu_to_le16(t16);
2180 pkt->relative_offset = cpu_to_le32(prm->cmd->offset); 2186 pkt->relative_offset = cpu_to_le32(prm->cmd->offset);
2181 2187
2182 /* Set transfer direction */ 2188 /* Set transfer direction */
@@ -2251,8 +2257,7 @@ qlt_build_ctio_crc2_pkt(struct qla_tgt_prm *prm, scsi_qla_host_t *vha)
2251 2257
2252 if (bundling && prm->prot_seg_cnt) { 2258 if (bundling && prm->prot_seg_cnt) {
2253 /* Walks dif segments */ 2259 /* Walks dif segments */
2254 pkt->add_flags |= 2260 pkt->add_flags |= CTIO_CRC2_AF_DIF_DSD_ENA;
2255 __constant_cpu_to_le16(CTIO_CRC2_AF_DIF_DSD_ENA);
2256 2261
2257 cur_dsd = (uint32_t *) &crc_ctx_pkt->u.bundling.dif_address; 2262 cur_dsd = (uint32_t *) &crc_ctx_pkt->u.bundling.dif_address;
2258 if (qla24xx_walk_and_build_prot_sglist(ha, NULL, cur_dsd, 2263 if (qla24xx_walk_and_build_prot_sglist(ha, NULL, cur_dsd,