diff options
| author | James Smart <james.smart@avagotech.com> | 2015-05-22 10:42:36 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-06-13 11:19:25 -0400 |
| commit | 73dc0dbed3f9f65c6f80fab429dd9771de794714 (patch) | |
| tree | 91a6eda620ac3d37e44bf6fa2e81c4bd547fadce /drivers/scsi/lpfc/lpfc_els.c | |
| parent | 481ad967991e1ff00d627d365de398b7a77e4d7f (diff) | |
lpfc: 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>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_els.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_els.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index 3aad09f7bc5c..30021f3f956f 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, | |||
| 8410 | 8410 | ||
| 8411 | if (irsp->ulpStatus == IOSTAT_SUCCESS) { | 8411 | if (irsp->ulpStatus == IOSTAT_SUCCESS) { |
| 8412 | spin_lock_irq(shost->host_lock); | 8412 | spin_lock_irq(shost->host_lock); |
| 8413 | vport->fc_flag &= ~FC_NDISC_ACTIVE; | ||
| 8413 | vport->fc_flag &= ~FC_FABRIC; | 8414 | vport->fc_flag &= ~FC_FABRIC; |
| 8414 | spin_unlock_irq(shost->host_lock); | 8415 | spin_unlock_irq(shost->host_lock); |
| 8416 | lpfc_can_disctmo(vport); | ||
| 8415 | } | 8417 | } |
| 8416 | } | 8418 | } |
| 8417 | 8419 | ||