[SCSI] lpfc 8.2.3 : FC Discovery Fixes

FC Discovery Fixes:
- Fix up lpfc_drop_node() vs lpfc_nlp_not_used() usage
- Clear ADISC flag when unregistering RPI and REMOVE ndlps if in recovery.
- Fix usage of UNUSED list and ndlps
- Fix PLOGI race conditions
- Reset link if NameServer PLOGI errors occur
- Synchronize GID_FT queries with PLOGI receptions

Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 10 insertions, 14 deletions

diff --git a/drivers/scsi/lpfc/lpfc_vport.c b/drivers/scsi/lpfc/lpfc_vport.c
index fd07d9d7f507..378c01200b02 100644
--- a/drivers/scsi/lpfc/lpfc_vport.c
+++ b/drivers/scsi/lpfc/lpfc_vport.c
@@ -445,7 +445,6 @@ int
 lpfc_vport_delete(struct fc_vport *fc_vport)
 {
         struct lpfc_nodelist *ndlp = NULL;
-        struct lpfc_nodelist *next_ndlp;
         struct Scsi_Host *shost = (struct Scsi_Host *) fc_vport->shost;
         struct lpfc_vport *vport = *(struct lpfc_vport **)fc_vport->dd_data;
         struct lpfc_hba   *phba = vport->phba;
@@ -531,23 +530,20 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
         }
 
 skip_logo:
+        lpfc_cleanup(vport);
         lpfc_sli_host_down(vport);
 
-        list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
-                lpfc_disc_state_machine(vport, ndlp, NULL,
-                                             NLP_EVT_DEVICE_RECOVERY);
-                lpfc_disc_state_machine(vport, ndlp, NULL,
-                                             NLP_EVT_DEVICE_RM);
-        }
-
         lpfc_stop_vport_timers(vport);
         lpfc_unreg_all_rpis(vport);
-        lpfc_unreg_default_rpis(vport);
-        /*
-         * Completion of unreg_vpi (lpfc_mbx_cmpl_unreg_vpi) does the
-         * scsi_host_put() to release the vport.
-         */
-        lpfc_mbx_unreg_vpi(vport);
+
+        if (!(phba->pport->load_flag & FC_UNLOADING)) {
+                lpfc_unreg_default_rpis(vport);
+                /*
+                 * Completion of unreg_vpi (lpfc_mbx_cmpl_unreg_vpi)
+                 * does the scsi_host_put() to release the vport.
+                 */
+                lpfc_mbx_unreg_vpi(vport);
+        }
 
         lpfc_free_vpi(phba, vport->vpi);
         vport->work_port_events = 0;