cpq driver compile fix
PATCH 1/1 cpq driver compile fix
This patch fixes the cpq driver's usage of sr_request (very trivial actually). Please drop this in place and the cpq driver should start working again. Thanks.
Signature · 4 lines
Doug Ledford <[email protected]> 919-754-3700 x44233 Red Hat, Inc. 1801 Varsity Dr. Raleigh, NC 27606
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.630 -> 1.631
# drivers/scsi/cpqfcTSinit.c 1.16 -> 1.17
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/07/16 [email protected] 1.631
# cpqfcTSinit.c:
# Fix usage of Scsi_Cmnd->request so it will compile.
# --------------------------------------------
#
drivers/scsi/cpqfcTSinit.c +5 -5
@@ -475,7 +475,7 @@ {struct request * req; - req = &SCpnt->request; + req = SCpnt->request; req->rq_status =RQ_SCSI_DONE ;/* Busy, but indicate request done */ if (req->CPQFC_WAITING !=NULL )
@@ -601,7 +601,7 @@ {CPQFC_DECLARE_COMPLETION (wait); - ScsiPassThruCmnd->request.CPQFC_WAITING = &wait; + ScsiPassThruCmnd->request->CPQFC_WAITING = &wait;// eventually gets us to our own _quecommand routine scsi_do_cmd( ScsiPassThruCmnd, &vendor_cmd->cdb[0], buf,
@@ -611,7 +611,7 @@// Other I/Os can now resume; we wait for our ioctl // command to complete CPQFC_WAIT_FOR_COMPLETION (&wait); - ScsiPassThruCmnd->request.CPQFC_WAITING =NULL ; + ScsiPassThruCmnd->request->CPQFC_WAITING =NULL ; } result = ScsiPassThruCmnd->result;
@@ -1543,10 +1543,10 @@ SCpnt->SCp.buffers_residual =FCP_TARGET_RESET ; - SCpnt->request.CPQFC_WAITING = &wait; + SCpnt->request->CPQFC_WAITING = &wait;scsi_do_cmd (SCpnt, scsi_cdb,NULL ,0 , my_ioctl_done, timeout, retries);CPQFC_WAIT_FOR_COMPLETION (&wait); - SCpnt->request.CPQFC_WAITING =NULL ; + SCpnt->request->CPQFC_WAITING =NULL ; }/*