diff options
| author | James Smart | 2013-03-01 22:35:12 +0100 |
|---|---|---|
| committer | James Bottomley | 2013-04-09 23:21:58 +0200 |
| commit | 0e9bb8d79c52ca115f3fc4a692ca0dd6931e2eeb (patch) | |
| tree | ca868fc67d44fbcff55e449f00ee4a4142098740 /drivers/scsi/lpfc/lpfc_hbadisc.c | |
| parent | [SCSI] libsas: fix handling vacant phy in sas_set_ex_phy() (diff) | |
| download | kernel-qcow2-linux-0e9bb8d79c52ca115f3fc4a692ca0dd6931e2eeb.tar.gz kernel-qcow2-linux-0e9bb8d79c52ca115f3fc4a692ca0dd6931e2eeb.tar.xz kernel-qcow2-linux-0e9bb8d79c52ca115f3fc4a692ca0dd6931e2eeb.zip | |
[SCSI] lpfc 8.3.38: Fixed NMI watch dog panic's when resetting the hba.
Fixed NMI watch dog panic's when resetting the hba.
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_hbadisc.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_hbadisc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index d7096ad94d3f..915e1aa6c681 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -696,7 +696,8 @@ lpfc_work_done(struct lpfc_hba *phba) (status & HA_RXMASK)); } - if ((phba->sli_rev == LPFC_SLI_REV4) && pring->txq_cnt) + if ((phba->sli_rev == LPFC_SLI_REV4) & + (!list_empty(&pring->txq))) lpfc_drain_txq(phba); /* * Turn on Ring interrupts @@ -4354,7 +4355,6 @@ lpfc_no_rpi(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp) with an error */ list_move_tail(&iocb->list, &completions); - pring->txq_cnt--; } } spin_unlock_irq(&phba->hbalock); @@ -5055,7 +5055,6 @@ lpfc_free_tx(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp) (icmd->ulpCommand == CMD_XMIT_ELS_RSP64_CX)) { list_move_tail(&iocb->list, &completions); - pring->txq_cnt--; } } |