From 57b322c2db15faccb3cb3a771e880d788ff13972 Mon Sep 17 00:00:00 2001 From: "James.Smart@Emulex.Com" Date: Sat, 25 Jun 2005 10:34:08 -0400 Subject: [PATCH] --- yaml --- r: 4983 b: refs/heads/master c: db468d108abc0bb348bcfc54b8e06145922fb6b1 h: refs/heads/master i: 4981: 62574a8353762e0e2b4dd2f85d76ebac4f9bbf35 4979: 5c3e29843cf49d11238145ee71feb4b317ce8eab 4975: 095467572156b79b0a5ae75346b963ab1a952533 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/lpfc/lpfc_sli.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index ab84c8094a74..365e9412c6b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e8215e48865bda2e07c1c0633952e35fa3b170c +refs/heads/master: db468d108abc0bb348bcfc54b8e06145922fb6b1 diff --git a/trunk/drivers/scsi/lpfc/lpfc_sli.c b/trunk/drivers/scsi/lpfc/lpfc_sli.c index 9493ec1b17e1..46e062dafd85 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_sli.c +++ b/trunk/drivers/scsi/lpfc/lpfc_sli.c @@ -1724,6 +1724,8 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba) return; } + phba->work_hba_events &= ~WORKER_MBOX_TMO; + pmbox = phba->sli.mbox_active; mb = &pmbox->mb; @@ -1738,16 +1740,14 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba) phba->sli.sli_flag, phba->sli.mbox_active); - if (phba->sli.mbox_active == pmbox) { - phba->sli.mbox_active = NULL; - if (pmbox->mbox_cmpl) { - mb->mbxStatus = MBX_NOT_FINISHED; - spin_unlock_irq(phba->host->host_lock); - (pmbox->mbox_cmpl) (phba, pmbox); - spin_lock_irq(phba->host->host_lock); - } - phba->sli.sli_flag &= ~LPFC_SLI_MBOX_ACTIVE; + phba->sli.mbox_active = NULL; + if (pmbox->mbox_cmpl) { + mb->mbxStatus = MBX_NOT_FINISHED; + spin_unlock_irq(phba->host->host_lock); + (pmbox->mbox_cmpl) (phba, pmbox); + spin_lock_irq(phba->host->host_lock); } + phba->sli.sli_flag &= ~LPFC_SLI_MBOX_ACTIVE; spin_unlock_irq(phba->host->host_lock); lpfc_mbox_abort(phba);