[SCSI] lpfc 8.3.44: Fixed stopped FCF discovery on failed FCF record read
Signed-off-by: James Smart <james.smart@emulex.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
parent
76f96b6dfd
commit
646a2dd751
drivers/scsi/lpfc
|
@ -2545,8 +2545,11 @@ lpfc_mbx_cmpl_fcf_rr_read_fcf_rec(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
|
||||||
if (!new_fcf_record) {
|
if (!new_fcf_record) {
|
||||||
lpfc_printf_log(phba, KERN_WARNING, LOG_FIP,
|
lpfc_printf_log(phba, KERN_WARNING, LOG_FIP,
|
||||||
"2766 Mailbox command READ_FCF_RECORD "
|
"2766 Mailbox command READ_FCF_RECORD "
|
||||||
"failed to retrieve a FCF record.\n");
|
"failed to retrieve a FCF record. "
|
||||||
goto error_out;
|
"hba_flg x%x fcf_flg x%x\n", phba->hba_flag,
|
||||||
|
phba->fcf.fcf_flag);
|
||||||
|
lpfc_unregister_fcf_rescan(phba);
|
||||||
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Get the needed parameters from FCF record */
|
/* Get the needed parameters from FCF record */
|
||||||
|
@ -3973,7 +3976,10 @@ lpfc_nlp_counters(struct lpfc_vport *vport, int state, int count)
|
||||||
vport->fc_map_cnt += count;
|
vport->fc_map_cnt += count;
|
||||||
break;
|
break;
|
||||||
case NLP_STE_NPR_NODE:
|
case NLP_STE_NPR_NODE:
|
||||||
vport->fc_npr_cnt += count;
|
if (vport->fc_npr_cnt == 0 && count == -1)
|
||||||
|
vport->fc_npr_cnt = 0;
|
||||||
|
else
|
||||||
|
vport->fc_npr_cnt += count;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
spin_unlock_irq(shost->host_lock);
|
spin_unlock_irq(shost->host_lock);
|
||||||
|
|
Loading…
Reference in New Issue