diff options
| author | James Smart | 2008-08-25 03:49:45 +0200 |
|---|---|---|
| committer | James Bottomley | 2008-10-13 15:28:53 +0200 |
| commit | 90160e010b6f3a91a9bb044bbe6723731e6f366c (patch) | |
| tree | 8320400d5bed96f1976cef88adcad647fcb48f9e /drivers/scsi/lpfc/lpfc_nportdisc.c | |
| parent | [SCSI] lpfc 8.2.8 : Add kernel-doc function headers (diff) | |
| download | kernel-qcow2-linux-90160e010b6f3a91a9bb044bbe6723731e6f366c.tar.gz kernel-qcow2-linux-90160e010b6f3a91a9bb044bbe6723731e6f366c.tar.xz kernel-qcow2-linux-90160e010b6f3a91a9bb044bbe6723731e6f366c.zip | |
[SCSI] lpfc 8.2.8 : Miscellaneous Discovery Fixes
Miscellaneous Discovery fixes:
- Fix rejection followed by acceptance in handling RPL and RPS
unsolicited events
- Fix for vport delete crash
- Fix PLOGI vs ADISC race condition
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_nportdisc.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_nportdisc.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c index 6688a8689b56..705c4ae1bdc3 100644 --- a/drivers/scsi/lpfc/lpfc_nportdisc.c +++ b/drivers/scsi/lpfc/lpfc_nportdisc.c @@ -1003,20 +1003,8 @@ lpfc_rcv_plogi_adisc_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, spin_lock_irq(shost->host_lock); ndlp->nlp_flag &= ~NLP_NPR_2B_DISC; spin_unlock_irq(shost->host_lock); - - if (vport->num_disc_nodes) { + if (vport->num_disc_nodes) lpfc_more_adisc(vport); - if ((vport->num_disc_nodes == 0) && - (vport->fc_npr_cnt)) - lpfc_els_disc_plogi(vport); - if (vport->num_disc_nodes == 0) { - spin_lock_irq(shost->host_lock); - vport->fc_flag &= ~FC_NDISC_ACTIVE; - spin_unlock_irq(shost->host_lock); - lpfc_can_disctmo(vport); - lpfc_end_rscn(vport); - } - } } return ndlp->nlp_state; } |