1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 2aabaf9c4053..f72fdf23bf1b 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -168,6 +168,19 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp,
         if (elsiocb == NULL)
                 return NULL;
 
+        /*
+         * If this command is for fabric controller and HBA running
+         * in FIP mode send FLOGI, FDISC and LOGO as FIP frames.
+         */
+        if ((did == Fabric_DID) &&
+                bf_get(lpfc_fip_flag, &phba->sli4_hba.sli4_flags) &&
+                ((elscmd == ELS_CMD_FLOGI) ||
+                 (elscmd == ELS_CMD_FDISC) ||
+                 (elscmd == ELS_CMD_LOGO)))
+                elsiocb->iocb_flag |= LPFC_FIP_ELS;
+        else
+                elsiocb->iocb_flag &= ~LPFC_FIP_ELS;
+
         icmd = &elsiocb->iocb;
 
         /* fill in BDEs for command */