mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-28 17:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2020-05-09 08:12:39 -07:00
parent 701428c1d0 f4ce28b5ab
commit 096e812053
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qla2x00t-32gbit/qla_isr.c
View File

@@ -2170,10 +2170,11 @@ static void qla24xx_nvme_iocb_entry(scsi_qla_host_t *vha, struct req_que *req,
}
if (state_flags & SF_NVME_ERSP) {
struct nvme_fc_ersp_iu *rsp_iu = fd->rspaddr;
u32 tgt_xfer_len;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
struct nvme_fc_ersp_iu *rsp_iu = fd->rspaddr;
/*
* xfrd_len was introduced by commit b1ad1475b447
* ("nvme-fabrics: Add FC transport FC-NVME definitions")

3
scst/include/backport.h
View File

@@ -187,7 +187,8 @@ static inline void *bsg_job_sense(struct bsg_job *job)
* See also f2f2efb807d3 ("byteorder: Move {cpu_to_be32, be32_to_cpu}_array()
* from Thunderbolt to core") # v4.15.
*/
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7)
static inline void cpu_to_be32_array(__be32 *dst, const u32 *src, size_t len)
{
int i;