From 2b07ba23743d3fc4a499cc98493022cf2dd23d4b Mon Sep 17 00:00:00 2001 From: Prasanna Mumbai Date: Thu, 2 Dec 2010 22:12:43 -0800 Subject: [PATCH] --- yaml --- r: 226818 b: refs/heads/master c: e128271b7bcb9c8955cadbf2e18f8af288979e6b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla4xxx/ql4_isr.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6b70c4de9f30..61a39b14984d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4cd83cbef878b5d0d4c65ac0a20d12a8bf9f551d +refs/heads/master: e128271b7bcb9c8955cadbf2e18f8af288979e6b diff --git a/trunk/drivers/scsi/qla4xxx/ql4_isr.c b/trunk/drivers/scsi/qla4xxx/ql4_isr.c index ca862b12a8db..90a217ff3a3f 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_isr.c +++ b/trunk/drivers/scsi/qla4xxx/ql4_isr.c @@ -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))