patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / scsi / qla2xxx / qla_rscn.c

diff --git a/drivers/scsi/qla2xxx/qla_rscn.c b/drivers/scsi/qla2xxx/qla_rscn.c
index 4f37f62..c522d03 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_rscn.c
+++ b/drivers/scsi/qla2xxx/qla_rscn.c
@@ -283,6 +283,8 @@ qla2x00_iodesc_timeout(unsigned long data)
 
        qla2x00_free_iodesc(iodesc);
 
+       qla_printk(KERN_WARNING, iodesc->ha,
+           "IO descriptor timeout. Scheduling ISP abort.\n");
        set_bit(ISP_ABORT_NEEDED, &iodesc->ha->dpc_flags);
 }
 
@@ -385,7 +387,7 @@ qla2x00_get_mbx_iocb_entry(scsi_qla_host_t *ha, uint32_t handle)
                if  (ha->req_ring_index < cnt)
                        ha->req_q_cnt = cnt - ha->req_ring_index;
                else
-                       ha->req_q_cnt = REQUEST_ENTRY_CNT -
+                       ha->req_q_cnt = ha->request_q_length -
                            (ha->req_ring_index - cnt);
        }
        if (ha->req_q_cnt >= 3) {