aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/qla2xxx')
-rw-r--r--drivers/scsi/qla2xxx/qla_fw.h4
-rw-r--r--drivers/scsi/qla2xxx/qla_iocb.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h
index fd9df163410c..63f611904a6c 100644
--- a/drivers/scsi/qla2xxx/qla_fw.h
+++ b/drivers/scsi/qla2xxx/qla_fw.h
@@ -394,7 +394,7 @@ struct cmd_type_6 {
394 394
395 uint16_t fcp_rsp_dsd_len; /* FCP_RSP DSD length. */ 395 uint16_t fcp_rsp_dsd_len; /* FCP_RSP DSD length. */
396 396
397 uint8_t lun[8]; /* FCP LUN (BE). */ 397 struct scsi_lun lun; /* FCP LUN (BE). */
398 398
399 uint16_t control_flags; /* Control flags. */ 399 uint16_t control_flags; /* Control flags. */
400#define CF_DATA_SEG_DESCR_ENABLE BIT_2 400#define CF_DATA_SEG_DESCR_ENABLE BIT_2
@@ -432,7 +432,7 @@ struct cmd_type_7 {
432 uint16_t dseg_count; /* Data segment count. */ 432 uint16_t dseg_count; /* Data segment count. */
433 uint16_t reserved_1; 433 uint16_t reserved_1;
434 434
435 uint8_t lun[8]; /* FCP LUN (BE). */ 435 struct scsi_lun lun; /* FCP LUN (BE). */
436 436
437 uint16_t task_mgmt_flags; /* Task management flags. */ 437 uint16_t task_mgmt_flags; /* Task management flags. */
438#define TMF_CLEAR_ACA BIT_14 438#define TMF_CLEAR_ACA BIT_14
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index d7355627f110..b58ee79177bc 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -839,8 +839,7 @@ qla24xx_start_scsi(srb_t *sp)
839 cmd_pkt->port_id[1] = sp->fcport->d_id.b.area; 839 cmd_pkt->port_id[1] = sp->fcport->d_id.b.area;
840 cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain; 840 cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain;
841 841
842 cmd_pkt->lun[1] = LSB(sp->cmd->device->lun); 842 int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun);
843 cmd_pkt->lun[2] = MSB(sp->cmd->device->lun);
844 843
845 /* Update tagged queuing modifier -- default is TSK_SIMPLE (0). */ 844 /* Update tagged queuing modifier -- default is TSK_SIMPLE (0). */
846 if (scsi_populate_tag_msg(cmd, tag)) { 845 if (scsi_populate_tag_msg(cmd, tag)) {