1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index 7c02a6c3b699..34eeb086a667 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -1099,6 +1099,8 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         /* If HBA supports SLI=3 ask for it */
 
         if (phba->sli_rev == 3 && phba->vpd.sli3Feat.cerbm) {
+                if (phba->cfg_enable_bg)
+                        mb->un.varCfgPort.cbg = 1; /* configure BlockGuard */
                 mb->un.varCfgPort.cerbm = 1; /* Request HBQs */
                 mb->un.varCfgPort.ccrp = 1; /* Command Ring Polling */
                 mb->un.varCfgPort.cinb = 1; /* Interrupt Notification Block */