From be07c06dc52d8ba929264bad01097687bd90dbbe Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 04:34:40 +0000 Subject: [PATCH] Merge r7456 from trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7709 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla_isr.c | 4 ++-- qla2x00t/qla_mbx.c | 2 +- scst/include/backport.h | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qla2x00t/qla_isr.c b/qla2x00t/qla_isr.c index fda2fce2a..5cfd038a9 100644 --- a/qla2x00t/qla_isr.c +++ b/qla2x00t/qla_isr.c @@ -1230,7 +1230,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req, pkt)->total_byte_count)); fw_sts_ptr = bsg_job_sense(bsg_job) + sizeof(struct fc_bsg_reply); - memcpy( fw_sts_ptr, fw_status, sizeof(fw_status)); + memcpy(fw_sts_ptr, fw_status, sizeof(fw_status)); } else { ql_dbg(ql_dbg_user, vha, 0x5040, @@ -1248,7 +1248,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req, #endif fw_sts_ptr = bsg_job_sense(bsg_job) + sizeof(struct fc_bsg_reply); - memcpy( fw_sts_ptr, fw_status, sizeof(fw_status)); + memcpy(fw_sts_ptr, fw_status, sizeof(fw_status)); } ql_dump_buffer(ql_dbg_user + ql_dbg_buffer, vha, 0x5056, (uint8_t *)pkt, sizeof(*pkt)); diff --git a/qla2x00t/qla_mbx.c b/qla2x00t/qla_mbx.c index f3d2cb76d..f2b04d572 100644 --- a/qla2x00t/qla_mbx.c +++ b/qla2x00t/qla_mbx.c @@ -4275,7 +4275,7 @@ qla2x00_echo_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq, uint16_t *mres } /* Copy mailbox information */ - memcpy( mresp, mcp->mb, 64); + memcpy(mresp, mcp->mb, 64); return rval; } diff --git a/scst/include/backport.h b/scst/include/backport.h index 2cae22307..4bcdc2927 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -391,10 +391,10 @@ enum umh_wait { /* */ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) && \ - ! (LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 4, 0) >> 8 && \ - LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 41)) && \ - ! (LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 2, 0) >> 8 && \ - LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 44)) && \ + !(LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 4, 0) >> 8 && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 41)) && \ + !(LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 2, 0) >> 8 && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 44)) && \ (!defined(CONFIG_SUSE_KERNEL) || \ LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 101)) && \ (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 6 || \