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 {
 
         uint16_t fcp_rsp_dsd_len;       /* FCP_RSP DSD length. */
 
-        uint8_t lun[8];                 /* FCP LUN (BE). */
+        struct scsi_lun lun;            /* FCP LUN (BE). */
 
         uint16_t control_flags;         /* Control flags. */
 #define CF_DATA_SEG_DESCR_ENABLE        BIT_2
@@ -432,7 +432,7 @@ struct cmd_type_7 {
         uint16_t dseg_count;            /* Data segment count. */
         uint16_t reserved_1;
 
-        uint8_t lun[8];                 /* FCP LUN (BE). */
+        struct scsi_lun lun;            /* FCP LUN (BE). */
 
         uint16_t task_mgmt_flags;       /* Task management flags. */
 #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)
         cmd_pkt->port_id[1] = sp->fcport->d_id.b.area;
         cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain;
 
-        cmd_pkt->lun[1] = LSB(sp->cmd->device->lun);
-        cmd_pkt->lun[2] = MSB(sp->cmd->device->lun);
+        int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun);
 
         /* Update tagged queuing modifier -- default is TSK_SIMPLE (0). */
         if (scsi_populate_tag_msg(cmd, tag)) {