From 1b7c86d25b814adeabedc97ab6c13b8646010dd2 Mon Sep 17 00:00:00 2001
From: Krishna Gudipati <kgudipat@brocade.com>
Date: Fri, 5 Mar 2010 19:38:27 -0800
Subject: [PATCH] --- yaml --- r: 188347 b: refs/heads/master c:
 95aa060decd2472d319c3f12b0b1b699a5f35058 h: refs/heads/master i:   188345:
 3bb874fd0e4a29878298239042a3bf5448c121ec   188343:
 205695be5a8e1c758a5865b0c59c4b3b30dde213 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/scsi/bfa/bfad_im.c | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3fcf4c4db299..44497f1ab1c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25e2934c26f5efaea156c9fda4457d01a8bb44e1
+refs/heads/master: 95aa060decd2472d319c3f12b0b1b699a5f35058
diff --git a/trunk/drivers/scsi/bfa/bfad_im.c b/trunk/drivers/scsi/bfa/bfad_im.c
index cee3d89d1412..fb7aefaba129 100644
--- a/trunk/drivers/scsi/bfa/bfad_im.c
+++ b/trunk/drivers/scsi/bfa/bfad_im.c
@@ -43,11 +43,11 @@ bfa_cb_ioim_done(void *drv, struct bfad_ioim_s *dio,
 	struct bfad_s         *bfad = drv;
 	struct bfad_itnim_data_s *itnim_data;
 	struct bfad_itnim_s *itnim;
+	u8         host_status = DID_OK;
 
 	switch (io_status) {
 	case BFI_IOIM_STS_OK:
 		bfa_trc(bfad, scsi_status);
-		cmnd->result = ScsiResult(DID_OK, scsi_status);
 		scsi_set_resid(cmnd, 0);
 
 		if (sns_len > 0) {
@@ -56,8 +56,18 @@ bfa_cb_ioim_done(void *drv, struct bfad_ioim_s *dio,
 				sns_len = SCSI_SENSE_BUFFERSIZE;
 			memcpy(cmnd->sense_buffer, sns_info, sns_len);
 		}
-		if (residue > 0)
+		if (residue > 0) {
+			bfa_trc(bfad, residue);
 			scsi_set_resid(cmnd, residue);
+			if (!sns_len && (scsi_status == SAM_STAT_GOOD) &&
+				(scsi_bufflen(cmnd) - residue) <
+					cmnd->underflow) {
+				bfa_trc(bfad, 0);
+				host_status = DID_ERROR;
+			}
+		}
+		cmnd->result = ScsiResult(host_status, scsi_status);
+
 		break;
 
 	case BFI_IOIM_STS_ABORTED: