mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-19 21:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge r7438 from trunk

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7691 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-11-04 04:24:14 +00:00
parent 097560fb1e
commit 5e1d32c971
2 changed files with 38 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qla2x00t/qla_bsg.c
+38 -392
View File
File diff suppressed because it is too large Load Diff
qla2x00t/qla_isr.c
-8
View File
@@ -1228,12 +1228,8 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
type, sp->handle, comp_status, fw_status[1], fw_status[2],
le16_to_cpu(((struct els_sts_entry_24xx *)
pkt)->total_byte_count));
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
fw_sts_ptr = ((uint8_t*)scsi_req(bsg_job->req)->sense) +
sizeof(struct fc_bsg_reply);
#else
fw_sts_ptr = ((uint8_t*)bsg_job->req->sense) + sizeof(struct fc_bsg_reply);
#endif
memcpy( fw_sts_ptr, fw_status, sizeof(fw_status));
}
else {
@@ -1250,12 +1246,8 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
#else
bsg_reply->reply_payload_rcv_len = 0;
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
fw_sts_ptr = ((uint8_t*)scsi_req(bsg_job->req)->sense) +
sizeof(struct fc_bsg_reply);
#else
fw_sts_ptr = ((uint8_t*)bsg_job->req->sense) + sizeof(struct fc_bsg_reply);
#endif
memcpy( fw_sts_ptr, fw_status, sizeof(fw_status));
}
ql_dump_buffer(ql_dbg_user + ql_dbg_buffer, vha, 0x5056,