[SCSI] lpfc 8.3.42: Fixed back to back RSCNs discovery failure.

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

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index cc834555689d..7801601aa5d9 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -4457,7 +4457,15 @@ lpfc_unreg_rpi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
         int rc;
         uint16_t rpi;
 
-        if (ndlp->nlp_flag & NLP_RPI_REGISTERED) {
+        if (ndlp->nlp_flag & NLP_RPI_REGISTERED ||
+            ndlp->nlp_flag & NLP_REG_LOGIN_SEND) {
+                if (ndlp->nlp_flag & NLP_REG_LOGIN_SEND)
+                        lpfc_printf_vlog(vport, KERN_INFO, LOG_SLI,
+                                         "3366 RPI x%x needs to be "
+                                         "unregistered nlp_flag x%x "
+                                         "did x%x\n",
+                                         ndlp->nlp_rpi, ndlp->nlp_flag,
+                                         ndlp->nlp_DID);
                 mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
                 if (mbox) {
                         /* SLI4 ports require the physical rpi value. */