From: James Smart <james.smart@broadcom.com>
Date: Wed, 6 Jul 2016 19:36:12 +0000 (-0700)
Subject: lpfc: Disable FDMI probing if not connected to a fabric
X-Git-Tag: v4.1.12-92~2^2~108
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=94e8bd9be38ba32693f4ff4e33e5599f00ec7274;p=users%2Fjedix%2Flinux-maple.git

lpfc: Disable FDMI probing if not connected to a fabric

Orabug: 25486030

Disable FDMI probing if not connected to a fabric

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit a03a4219a4e0b3e53078a2f97fee0b5a4cab2a20)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index a38816e96654..63e48d4277b0 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -1510,6 +1510,10 @@ lpfc_fdmi_num_disc_check(struct lpfc_vport *vport)
 	if (!lpfc_is_link_up(phba))
 		return;
 
+	/* Must be connected to a Fabric */
+	if (!(vport->fc_flag & FC_FABRIC))
+		return;
+
 	if (!(vport->fdmi_port_mask & LPFC_FDMI_PORT_ATTR_num_disc))
 		return;