From: James Smart Date: Wed, 6 Jul 2016 19:36:02 +0000 (-0700) Subject: lpfc: Correct FCOE discovery to avoid loss of storage devices after system reboot X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a1cadfeffac70a1ed77b45a8f93b92b9cb501d94;p=linux-beck.git lpfc: Correct FCOE discovery to avoid loss of storage devices after system reboot Correct FCOE discovery to avoid loss of storage devices after system reboot Signed-off-by: Dick Kennedy Signed-off-by: James Smart Reviewed-by: Hannes Reinecke Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index bb514d2262cf..8d940ed2b504 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -4484,7 +4484,8 @@ lpfc_sli4_async_fip_evt(struct lpfc_hba *phba, * the corresponding FCF bit in the roundrobin bitmap. */ spin_lock_irq(&phba->hbalock); - if (phba->fcf.fcf_flag & FCF_DISCOVERY) { + if ((phba->fcf.fcf_flag & FCF_DISCOVERY) && + (phba->fcf.current_rec.fcf_indx != acqe_fip->index)) { spin_unlock_irq(&phba->hbalock); /* Update FLOGI FCF failover eligible FCF bmask */ lpfc_sli4_fcf_rr_index_clear(phba, acqe_fip->index);