diff options
Diffstat (limited to 'drivers/scsi/bnx2i')
-rw-r--r-- | drivers/scsi/bnx2i/bnx2i_hwi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c index 5c54a2d9b834..550e6c4ea8b4 100644 --- a/drivers/scsi/bnx2i/bnx2i_hwi.c +++ b/drivers/scsi/bnx2i/bnx2i_hwi.c | |||
@@ -430,7 +430,7 @@ int bnx2i_send_iscsi_tmf(struct bnx2i_conn *bnx2i_conn, | |||
430 | default: | 430 | default: |
431 | tmfabort_wqe->ref_itt = RESERVED_ITT; | 431 | tmfabort_wqe->ref_itt = RESERVED_ITT; |
432 | } | 432 | } |
433 | memcpy(scsi_lun, tmfabort_hdr->lun, sizeof(struct scsi_lun)); | 433 | memcpy(scsi_lun, &tmfabort_hdr->lun, sizeof(struct scsi_lun)); |
434 | tmfabort_wqe->lun[0] = be32_to_cpu(scsi_lun[0]); | 434 | tmfabort_wqe->lun[0] = be32_to_cpu(scsi_lun[0]); |
435 | tmfabort_wqe->lun[1] = be32_to_cpu(scsi_lun[1]); | 435 | tmfabort_wqe->lun[1] = be32_to_cpu(scsi_lun[1]); |
436 | 436 | ||
@@ -547,7 +547,7 @@ int bnx2i_send_iscsi_nopout(struct bnx2i_conn *bnx2i_conn, | |||
547 | 547 | ||
548 | nopout_wqe->op_code = nopout_hdr->opcode; | 548 | nopout_wqe->op_code = nopout_hdr->opcode; |
549 | nopout_wqe->op_attr = ISCSI_FLAG_CMD_FINAL; | 549 | nopout_wqe->op_attr = ISCSI_FLAG_CMD_FINAL; |
550 | memcpy(nopout_wqe->lun, nopout_hdr->lun, 8); | 550 | memcpy(nopout_wqe->lun, &nopout_hdr->lun, 8); |
551 | 551 | ||
552 | if (test_bit(BNX2I_NX2_DEV_57710, &ep->hba->cnic_dev_type)) { | 552 | if (test_bit(BNX2I_NX2_DEV_57710, &ep->hba->cnic_dev_type)) { |
553 | u32 tmp = nopout_wqe->lun[0]; | 553 | u32 tmp = nopout_wqe->lun[0]; |
@@ -1711,7 +1711,7 @@ static int bnx2i_process_nopin_mesg(struct iscsi_session *session, | |||
1711 | hdr->flags = ISCSI_FLAG_CMD_FINAL; | 1711 | hdr->flags = ISCSI_FLAG_CMD_FINAL; |
1712 | hdr->itt = task->hdr->itt; | 1712 | hdr->itt = task->hdr->itt; |
1713 | hdr->ttt = cpu_to_be32(nop_in->ttt); | 1713 | hdr->ttt = cpu_to_be32(nop_in->ttt); |
1714 | memcpy(hdr->lun, nop_in->lun, 8); | 1714 | memcpy(&hdr->lun, nop_in->lun, 8); |
1715 | } | 1715 | } |
1716 | done: | 1716 | done: |
1717 | __iscsi_complete_pdu(conn, (struct iscsi_hdr *)hdr, NULL, 0); | 1717 | __iscsi_complete_pdu(conn, (struct iscsi_hdr *)hdr, NULL, 0); |
@@ -1754,7 +1754,7 @@ static void bnx2i_process_async_mesg(struct iscsi_session *session, | |||
1754 | resp_hdr->opcode = async_cqe->op_code; | 1754 | resp_hdr->opcode = async_cqe->op_code; |
1755 | resp_hdr->flags = 0x80; | 1755 | resp_hdr->flags = 0x80; |
1756 | 1756 | ||
1757 | memcpy(resp_hdr->lun, async_cqe->lun, 8); | 1757 | memcpy(&resp_hdr->lun, async_cqe->lun, 8); |
1758 | resp_hdr->exp_cmdsn = cpu_to_be32(async_cqe->exp_cmd_sn); | 1758 | resp_hdr->exp_cmdsn = cpu_to_be32(async_cqe->exp_cmd_sn); |
1759 | resp_hdr->max_cmdsn = cpu_to_be32(async_cqe->max_cmd_sn); | 1759 | resp_hdr->max_cmdsn = cpu_to_be32(async_cqe->max_cmd_sn); |
1760 | 1760 | ||