1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index 9c2c7c7140c..0dfa310cd60 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -815,9 +815,15 @@ void
 lpfc_reg_vpi(struct lpfc_vport *vport, LPFC_MBOXQ_t *pmb)
 {
         MAILBOX_t *mb = &pmb->u.mb;
+        struct lpfc_hba *phba = vport->phba;
 
         memset(pmb, 0, sizeof (LPFC_MBOXQ_t));
-
+        /*
+         * Set the re-reg VPI bit for f/w to update the MAC address.
+         */
+        if ((phba->sli_rev == LPFC_SLI_REV4) &&
+                !(vport->fc_flag & FC_VPORT_NEEDS_REG_VPI))
+                mb->un.varRegVpi.upd = 1;
         mb->un.varRegVpi.vpi = vport->vpi + vport->phba->vpi_base;
         mb->un.varRegVpi.sid = vport->fc_myDID;
         mb->un.varRegVpi.vfi = vport->vfi + vport->phba->vfi_base;