From 39aacc5bbb56f4a018e08269e06a31f66e7500be Mon Sep 17 00:00:00 2001
From: Chad Dupuis <chad.dupuis@qlogic.com>
Date: Fri, 15 Oct 2010 11:27:42 -0700
Subject: [PATCH] --- yaml --- r: 221483 b: refs/heads/master c:
 ff454b01b4ebe60b14092943978000928bf8c551 h: refs/heads/master i:   221481:
 3e500052c3a234d0deca1975803357c4ca6e58b7   221479:
 c0f0be1fd60eb643569bc66c14c9eb3005d06fa1 v: v3

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

diff --git a/[refs] b/[refs]
index ac5d50b653e7..3b1be2ccc18c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d97cc5342ebb1bef83477fafe18490dd8c59464
+refs/heads/master: ff454b01b4ebe60b14092943978000928bf8c551
diff --git a/trunk/drivers/scsi/qla2xxx/qla_isr.c b/trunk/drivers/scsi/qla2xxx/qla_isr.c
index e0e43d9e7ed1..55870a36ec6a 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_isr.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_isr.c
@@ -1757,6 +1757,8 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
 	case CS_INCOMPLETE:
 	case CS_PORT_UNAVAILABLE:
 	case CS_TIMEOUT:
+	case CS_RESET:
+
 		/*
 		 * We are going to have the fc class block the rport
 		 * while we try to recover so instruct the mid layer
@@ -1781,10 +1783,6 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
 			qla2x00_mark_device_lost(fcport->vha, fcport, 1, 1);
 		break;
 
-	case CS_RESET:
-		cp->result = DID_TRANSPORT_DISRUPTED << 16;
-		break;
-
 	case CS_ABORTED:
 		cp->result = DID_RESET << 16;
 		break;