[SCSI] lpfc 8.2.5 : Miscellaneous Fixes

Miscellaneous fixes:
- Fix ERRATT flag which was overlapping
- Allow RESTART mbx commands through when stopped.
- Accept incoming PLOGI when connected to an N_Port.
- Fix NPort to NPort pt2pt problems: ADISC and reg_vpi issues
- Fix vport unloading error that erroneously cleaned up RSCN buffers
- Fix memory leak during repeated unloads - in mbox handling
- Fix link bounce vs FLOGI race conditions

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

1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 01d548375811..d513813f6697 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -645,13 +645,15 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
                 return 0;
         }
 
-        /* Check config parameter use-adisc or FCP-2 */
-        if ((vport->cfg_use_adisc && (vport->fc_flag & FC_RSCN_MODE)) ||
-            ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE) {
-                spin_lock_irq(shost->host_lock);
-                ndlp->nlp_flag |= NLP_NPR_ADISC;
-                spin_unlock_irq(shost->host_lock);
-                return 1;
+        if (!(vport->fc_flag & FC_PT2PT)) {
+                /* Check config parameter use-adisc or FCP-2 */
+                if ((vport->cfg_use_adisc && (vport->fc_flag & FC_RSCN_MODE)) ||
+                    ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE) {
+                        spin_lock_irq(shost->host_lock);
+                        ndlp->nlp_flag |= NLP_NPR_ADISC;
+                        spin_unlock_irq(shost->host_lock);
+                        return 1;
+                }
         }
         ndlp->nlp_flag &= ~NLP_NPR_ADISC;
         lpfc_unreg_rpi(vport, ndlp);