Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[net-next-2.6.git] / drivers / scsi / qla2xxx / qla_isr.c

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 28f65be19dad9878f19981a18ebc60ef13bed356..e0e43d9e7ed130346d27f86c7f60b933c2fea6cf 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -412,8 +412,14 @@ skip_rio:
                                    "Unrecoverable Hardware Error: adapter "
                                    "marked OFFLINE!\n");
                                vha->flags.online = 0;
-                       } else
+                       } else {
+                               /* Check to see if MPI timeout occured */
+                               if ((mbx & MBX_3) && (ha->flags.port0))
+                                       set_bit(MPI_RESET_NEEDED,
+                                           &vha->dpc_flags);
+
                                set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
+                       }
                } else if (mb[1] == 0) {
                        qla_printk(KERN_INFO, ha,
                            "Unrecoverable Hardware Error: adapter marked "