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 a38816e96654963c3785bd93f31359ce541b3ee1..63e48d4277b025173789d16e9c415ab3a0e9d603 100644 (file)
--- 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;