Message ID | 555f405c.KmVvOAygQVUDcayN%james.smart@avagotech.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 05/22/2015 04:42 PM, James Smart wrote: > > Fix vport deletion failure. > > If a vport was deleted while in the middle of discovery, we weren't > clearing the nport discovery flag. Correct by clearing the flag and > cancelling our discovery timeout timer. > > Signed-off-by: Dick Kennedy <dick.kennedy@avagotech.com> > Signed-off-by: James Smart <james.smart@avagotech.com> > --- Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index 3aad09f..30021f3 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c @@ -8410,8 +8410,10 @@ lpfc_cmpl_els_npiv_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, if (irsp->ulpStatus == IOSTAT_SUCCESS) { spin_lock_irq(shost->host_lock); + vport->fc_flag &= ~FC_NDISC_ACTIVE; vport->fc_flag &= ~FC_FABRIC; spin_unlock_irq(shost->host_lock); + lpfc_can_disctmo(vport); } }