1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index 09ecdcb63a74..a592733664e9 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -560,7 +560,8 @@ lpfc_build_hbq_profile5(struct config_hbq_var *hbqmb,
 }
 
 void
-lpfc_config_hbq(struct lpfc_hba *phba, struct lpfc_hbq_init *hbq_desc,
+lpfc_config_hbq(struct lpfc_hba *phba, uint32_t id,
+                 struct lpfc_hbq_init *hbq_desc,
                 uint32_t hbq_entry_index, LPFC_MBOXQ_t *pmb)
 {
         int i;
@@ -568,6 +569,7 @@ lpfc_config_hbq(struct lpfc_hba *phba, struct lpfc_hbq_init *hbq_desc,
         struct config_hbq_var *hbqmb = &mb->un.varCfgHbq;
 
         memset(pmb, 0, sizeof (LPFC_MBOXQ_t));
+        hbqmb->hbqId = id;
         hbqmb->entry_count = hbq_desc->entry_count;   /* # entries in HBQ */
         hbqmb->recvNotify = hbq_desc->rn;             /* Receive
                                                        * Notification */
@@ -687,7 +689,7 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 
         if (phba->sli_rev == 3 && phba->vpd.sli3Feat.cerbm) {
                 mb->un.varCfgPort.cerbm = 1; /* Request HBQs */
-                mb->un.varCfgPort.max_hbq = 1; /* Requesting 2 HBQs */
+                mb->un.varCfgPort.max_hbq = lpfc_sli_hbq_count();
                 if (phba->max_vpi && phba->cfg_enable_npiv &&
                     phba->vpd.sli3Feat.cmv) {
                         mb->un.varCfgPort.max_vpi = phba->max_vpi;