aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zou <yi.zou@intel.com>2009-10-21 19:26:50 -0400
committerJames Bottomley <James.Bottomley@suse.de>2009-12-04 13:00:23 -0500
commit5e472d077f45de4f37365171bd742f18b3ef20de (patch)
tree2a028b3baa250bfaba8aabdc3649d2ee380715cd
parent85b5893ca97c69e409ecbb5ee90a5d99882369c4 (diff)
[SCSI] libfc: fix ddp in fc_fcp for 0 xid
xid 0 was used as an indication of invalid xid before but now xid 0 can be used as a valid exchange i. This patch fixes the ddp completion in fcp layer, i.e., in fc_fcp.c:fc_fcp_ddp_done() function, to make sure it does not use xid 0 for indication of an invalid xid, instead, it now uses use FC_XID_UNKNOWN for such indication. Signed-off-by: Yi Zou <yi.zou@intel.com> Signed-off-by: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-rw-r--r--drivers/scsi/libfc/fc_fcp.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index 59a4408b27b5..e6c6f4742368 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -302,10 +302,13 @@ static void fc_fcp_ddp_done(struct fc_fcp_pkt *fsp)
302 if (!fsp) 302 if (!fsp)
303 return; 303 return;
304 304
305 if (fsp->xfer_ddp == FC_XID_UNKNOWN)
306 return;
307
305 lp = fsp->lp; 308 lp = fsp->lp;
306 if (fsp->xfer_ddp && lp->tt.ddp_done) { 309 if (lp->tt.ddp_done) {
307 fsp->xfer_len = lp->tt.ddp_done(lp, fsp->xfer_ddp); 310 fsp->xfer_len = lp->tt.ddp_done(lp, fsp->xfer_ddp);
308 fsp->xfer_ddp = 0; 311 fsp->xfer_ddp = FC_XID_UNKNOWN;
309 } 312 }
310} 313}
311 314
@@ -1708,6 +1711,7 @@ int fc_queuecommand(struct scsi_cmnd *sc_cmd, void (*done)(struct scsi_cmnd *))
1708 fsp->cmd = sc_cmd; /* save the cmd */ 1711 fsp->cmd = sc_cmd; /* save the cmd */
1709 fsp->lp = lp; /* save the softc ptr */ 1712 fsp->lp = lp; /* save the softc ptr */
1710 fsp->rport = rport; /* set the remote port ptr */ 1713 fsp->rport = rport; /* set the remote port ptr */
1714 fsp->xfer_ddp = FC_XID_UNKNOWN;
1711 sc_cmd->scsi_done = done; 1715 sc_cmd->scsi_done = done;
1712 1716
1713 /* 1717 /*