From 00e1713fe9095c1779fe65bb8f0969bff530414b Mon Sep 17 00:00:00 2001
From: Vasu Dev <vasu.dev@intel.com>
Date: Fri, 8 Oct 2010 17:12:15 -0700
Subject: [PATCH] --- yaml --- r: 221471 b: refs/heads/master c:
 75eee7252466342e0dfa6675106bcd3955090f67 h: refs/heads/master i:   221469:
 e73450c7b809ef8489805f1ada9cfacaea8055bb   221467:
 b5a4a0c49a2d258418a51af565671000d21ff4ed   221463:
 1b57c3c00f4243acd2f2468a7202cfefa3aaa8de   221455:
 f605aeca80af5e5c65a6a893661cf1b86157429d   221439:
 8c565d67635e72e770f3dd9dd188f13449d6e0d7 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/scsi/libfc/fc_fcp.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1ede73a04e98..a4e06ed554f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73b4376477672a4336cba5f26ede2e277511ce70
+refs/heads/master: 75eee7252466342e0dfa6675106bcd3955090f67
diff --git a/trunk/drivers/scsi/libfc/fc_fcp.c b/trunk/drivers/scsi/libfc/fc_fcp.c
index c797f6b48f05..43866e6d0bf2 100644
--- a/trunk/drivers/scsi/libfc/fc_fcp.c
+++ b/trunk/drivers/scsi/libfc/fc_fcp.c
@@ -1971,10 +1971,8 @@ static void fc_io_compl(struct fc_fcp_pkt *fsp)
 		break;
 	}
 
-	if (lport->state != LPORT_ST_READY && fsp->status_code != FC_COMPLETE) {
-		sc_cmd->result = (DID_REQUEUE << 16);
-		FC_FCP_DBG(fsp, "Returning DID_REQUEUE to scsi-ml\n");
-	}
+	if (lport->state != LPORT_ST_READY && fsp->status_code != FC_COMPLETE)
+		sc_cmd->result = (DID_TRANSPORT_DISRUPTED << 16);
 
 	spin_lock_irqsave(&si->scsi_queue_lock, flags);
 	list_del(&fsp->list);