Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / scsi / qla4xxx / ql4_isr.c

diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index 7c33fd5943d50315a22ac5ff64de69799fe795a2..6ffbe9727dffb5c670b93731d2d121446b7d72b6 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -1,6 +1,6 @@
 /*
  * QLogic iSCSI HBA Driver
- * Copyright (c)  2003-2006 QLogic Corporation
+ * Copyright (c)  2003-2010 QLogic Corporation
  *
  * See LICENSE.qla4xxx for copyright and licensing details.
  */
@@ -554,7 +554,8 @@ static void qla4xxx_isr_decode_mailbox(struct scsi_qla_host * ha,
                        /* mbox_sts[2] = Old ACB state
                         * mbox_sts[3] = new ACB state */
                        if ((mbox_sts[3] == ACB_STATE_VALID) &&
-                           (mbox_sts[2] == ACB_STATE_TENTATIVE))
+                           ((mbox_sts[2] == ACB_STATE_TENTATIVE) ||
+                           (mbox_sts[2] == ACB_STATE_ACQUIRING)))
                                set_bit(DPC_GET_DHCP_IP_ADDR, &ha->dpc_flags);
                        else if ((mbox_sts[3] == ACB_STATE_ACQUIRING) &&
                            (mbox_sts[2] == ACB_STATE_VALID))
@@ -1077,7 +1078,7 @@ try_msi:
        ret = pci_enable_msi(ha->pdev);
        if (!ret) {
                ret = request_irq(ha->pdev->irq, qla4_8xxx_msi_handler,
-                       IRQF_DISABLED|IRQF_SHARED, DRIVER_NAME, ha);
+                       0, DRIVER_NAME, ha);
                if (!ret) {
                        DEBUG2(ql4_printk(KERN_INFO, ha, "MSI: Enabled.\n"));
                        set_bit(AF_MSI_ENABLED, &ha->flags);
@@ -1095,7 +1096,7 @@ try_msi:
 try_intx:
        /* Trying INTx */
        ret = request_irq(ha->pdev->irq, ha->isp_ops->intr_handler,
-           IRQF_DISABLED|IRQF_SHARED, DRIVER_NAME, ha);
+           IRQF_SHARED, DRIVER_NAME, ha);
        if (!ret) {
                DEBUG2(ql4_printk(KERN_INFO, ha, "INTx: Enabled.\n"));
                set_bit(AF_INTx_ENABLED, &ha->flags);