From d641dd62a669cd04bf1397a1af480249dee20416 Mon Sep 17 00:00:00 2001 From: Vasu Dev Date: Tue, 16 Feb 2010 12:15:18 -0800 Subject: [PATCH] --- yaml --- r: 181359 b: refs/heads/master c: be88d3b26897e3e942f2f36ad3d0ffbe002c0088 h: refs/heads/master i: 181357: ff906f62fd2b69f09bfa502a61fe3230ce0f64d1 181355: df6b9c02facc1242a16259c9ebaa9ba6a558ffde 181351: 9fa64abfb7d09d1b0b633730ad56e18c2cf6482e 181343: 9d52d6c48da7c1b97c9fc54a89270a21fff9684f v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libfc/fc_exch.c | 2 +- trunk/drivers/scsi/libfc/fc_fcp.c | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3fb236ede5d7..c914ffdcef07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fceef1f357e1b3485363e6e240369fc8cbee173 +refs/heads/master: be88d3b26897e3e942f2f36ad3d0ffbe002c0088 diff --git a/trunk/drivers/scsi/libfc/fc_exch.c b/trunk/drivers/scsi/libfc/fc_exch.c index 19d711cb938c..7f4364770e4a 100644 --- a/trunk/drivers/scsi/libfc/fc_exch.c +++ b/trunk/drivers/scsi/libfc/fc_exch.c @@ -1890,7 +1890,7 @@ static struct fc_seq *fc_exch_seq_send(struct fc_lport *lport, fc_exch_setup_hdr(ep, fp, ep->f_ctl); sp->cnt++; - if (ep->xid <= lport->lro_xid) + if (ep->xid <= lport->lro_xid && fh->fh_r_ctl == FC_RCTL_DD_UNSOL_CMD) fc_fcp_ddp_setup(fr_fsp(fp), ep->xid); if (unlikely(lport->tt.frame_send(lport, fp))) diff --git a/trunk/drivers/scsi/libfc/fc_fcp.c b/trunk/drivers/scsi/libfc/fc_fcp.c index 881d5dfe8c74..6fde2fabfd9b 100644 --- a/trunk/drivers/scsi/libfc/fc_fcp.c +++ b/trunk/drivers/scsi/libfc/fc_fcp.c @@ -298,9 +298,6 @@ void fc_fcp_ddp_setup(struct fc_fcp_pkt *fsp, u16 xid) { struct fc_lport *lport; - if (!fsp) - return; - lport = fsp->lp; if ((fsp->req_flags & FC_SRB_READ) && (lport->lro_enabled) && (lport->tt.ddp_setup)) {