From 7516730a3b97b3c899da80e97703837632c7a314 Mon Sep 17 00:00:00 2001
From: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Mon, 12 May 2008 22:21:15 -0700
Subject: [PATCH] --- yaml --- r: 97592 b: refs/heads/master c:
 a7cd02320eeee9992c7eba347555e8970042b68c h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/scsi/qla2xxx/qla_isr.c | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 4bd58dd3afb7..3eba31716666 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2ba5675d8993e669182250e41ad83e7a0b5d4ad
+refs/heads/master: a7cd02320eeee9992c7eba347555e8970042b68c
diff --git a/trunk/drivers/scsi/qla2xxx/qla_isr.c b/trunk/drivers/scsi/qla2xxx/qla_isr.c
index 0793aa9f161f..14bcd7cc9ae2 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_isr.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_isr.c
@@ -1132,25 +1132,6 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
 				break;
 
 			qla2x00_handle_sense(sp, sense_data, sense_len);
-
-			/*
-			 * In case of a Underrun condition, set both the lscsi
-			 * status and the completion status to appropriate
-			 * values.
-			 */
-			if (resid &&
-			    ((unsigned)(scsi_bufflen(cp) - resid) <
-			     cp->underflow)) {
-				DEBUG2(qla_printk(KERN_INFO, ha,
-				    "scsi(%ld:%d:%d:%d): Mid-layer underflow "
-				    "detected (%x of %x bytes)...returning "
-				    "error status.\n", ha->host_no,
-				    cp->device->channel, cp->device->id,
-				    cp->device->lun, resid,
-				    scsi_bufflen(cp)));
-
-				cp->result = DID_ERROR << 16 | lscsi_status;
-			}
 		} else {
 			/*
 			 * If RISC reports underrun and target does not report