diff options
| author |   Martin K. Petersen <martin.petersen@oracle.com> | 2021-10-12 11:58:12 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-10-12 11:58:12 -0400 |
| commit | ec65e6beb02e09e34f3811dd85f7247da35edafc (patch) | |
| tree | ecaa55e109261b04d00d81add853f1ba20838523 /drivers/scsi/lpfc/lpfc_hw4.h | |
| parent | scsi: smartpqi: Update version to 2.1.12-055 (diff) | |
| parent | scsi: iscsi: Fix iscsi_task use after free (diff) | |
| download | wireguard-linux-ec65e6beb02e09e34f3811dd85f7247da35edafc.tar.xz wireguard-linux-ec65e6beb02e09e34f3811dd85f7247da35edafc.zip | |
Merge branch '5.15/scsi-fixes' into 5.16/scsi-staging
Merge the 5.15/scsi-fixes branch into the staging tree to resolve UFS
conflict reported by sfr.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_hw4.h')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_hw4.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h index 143b73f71333..6ec42991d2ab 100644 --- a/drivers/scsi/lpfc/lpfc_hw4.h +++ b/drivers/scsi/lpfc/lpfc_hw4.h @@ -1171,7 +1171,7 @@ struct lpfc_mbx_read_object { /* Version 0 */ #define lpfc_mbx_rd_object_rlen_MASK 0x00FFFFFF #define lpfc_mbx_rd_object_rlen_WORD word0 uint32_t rd_object_offset; - uint32_t rd_object_name[LPFC_MBX_OBJECT_NAME_LEN_DW]; + __le32 rd_object_name[LPFC_MBX_OBJECT_NAME_LEN_DW]; #define LPFC_OBJ_NAME_SZ 104 /* 26 x sizeof(uint32_t) is 104. */ uint32_t rd_object_cnt; struct lpfc_mbx_host_buf rd_object_hbuf[4]; |