3 files changed, 19 insertions, 12 deletions

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 7096945ea234..7b3efd531297 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2476,17 +2476,9 @@ typedef struct scsi_qla_host {
  */
 #define LOOP_TRANSITION(ha) \
         (test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \
-         test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))
-
-#define LOOP_NOT_READY(ha) \
-        ((test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \
-          test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags) || \
-          test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \
-          test_bit(LOOP_RESYNC_ACTIVE, &ha->dpc_flags)) || \
+         test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \
          atomic_read(&ha->loop_state) == LOOP_DOWN)
 
-#define LOOP_RDY(ha)    (!LOOP_NOT_READY(ha))
-
 #define TGT_Q(ha, t) (ha->otgt[t])
 
 #define to_qla_host(x)          ((scsi_qla_host_t *) (x)->hostdata)
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 2d720121a0d3..c46d2469b85f 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1259,7 +1259,7 @@ qla2x00_configure_hba(scsi_qla_host_t *ha)
         rval = qla2x00_get_adapter_id(ha,
             &loop_id, &al_pa, &area, &domain, &topo);
         if (rval != QLA_SUCCESS) {
-                if (LOOP_NOT_READY(ha) || atomic_read(&ha->loop_down_timer) ||
+                if (LOOP_TRANSITION(ha) || atomic_read(&ha->loop_down_timer) ||
                     (rval == QLA_COMMAND_ERROR && loop_id == 0x7)) {
                         DEBUG2(printk("%s(%ld) Loop is in a transition state\n",
                             __func__, ha->host_no));
@@ -1796,7 +1796,7 @@ qla2x00_configure_loop(scsi_qla_host_t *ha)
         }
 
         if (rval == QLA_SUCCESS && test_bit(RSCN_UPDATE, &flags)) {
-                if (LOOP_NOT_READY(ha)) {
+                if (LOOP_TRANSITION(ha)) {
                         rval = QLA_FUNCTION_FAILED;
                 } else {
                         rval = qla2x00_configure_fabric(ha);
@@ -2369,7 +2369,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports)
                 if (qla2x00_is_reserved_id(ha, loop_id))
                         continue;
 
-                if (atomic_read(&ha->loop_down_timer) || LOOP_NOT_READY(ha))
+                if (atomic_read(&ha->loop_down_timer) || LOOP_TRANSITION(ha))
                         break;
 
                 if (swl != NULL) {
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 09afc0f06bd4..5181d966fecb 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -909,6 +909,21 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
                         resid = resid_len;
                         cp->resid = resid;
                         CMD_RESID_LEN(cp) = resid;
+
+                        if (!lscsi_status &&
+                            ((unsigned)(cp->request_bufflen - resid) <
+                             cp->underflow)) {
+                                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,
+                                    cp->request_bufflen);
+
+                                cp->result = DID_ERROR << 16;
+                                break;
+                        }
                 }
                 cp->result = DID_OK << 16 | lscsi_status;