1 files changed, 21 insertions, 2 deletions

diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index e84dc33ca201..9c2c7c7140c7 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -955,6 +955,26 @@ lpfc_read_rev(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
         return;
 }
 
+void
+lpfc_sli4_swap_str(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
+{
+        MAILBOX_t *mb = &pmb->u.mb;
+        struct lpfc_mqe *mqe;
+
+        switch (mb->mbxCommand) {
+        case  MBX_READ_REV:
+                 mqe = &pmb->u.mqe;
+                lpfc_sli_pcimem_bcopy(mqe->un.read_rev.fw_name,
+                                 mqe->un.read_rev.fw_name, 16);
+                lpfc_sli_pcimem_bcopy(mqe->un.read_rev.ulp_fw_name,
+                                 mqe->un.read_rev.ulp_fw_name, 16);
+                break;
+        default:
+                break;
+        }
+        return;
+}
+
 /**
  * lpfc_build_hbq_profile2 - Set up the HBQ Selection Profile 2
  * @hbqmb: pointer to the HBQ configuration data structure in mailbox command.
@@ -1199,7 +1219,6 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                 mb->un.varCfgPort.cdss = 1; /* Configure Security */
                 mb->un.varCfgPort.cerbm = 1; /* Request HBQs */
                 mb->un.varCfgPort.ccrp = 1; /* Command Ring Polling */
-                mb->un.varCfgPort.cinb = 1; /* Interrupt Notification Block */
                 mb->un.varCfgPort.max_hbq = lpfc_sli_hbq_count();
                 if (phba->max_vpi && phba->cfg_enable_npiv &&
                     phba->vpd.sli3Feat.cmv) {
@@ -2026,7 +2045,7 @@ lpfc_reg_fcfi(struct lpfc_hba *phba, struct lpfcMboxq *mbox)
                phba->fcf.current_rec.fcf_indx);
         /* reg_fcf addr mode is bit wise inverted value of fcf addr_mode */
         bf_set(lpfc_reg_fcfi_mam, reg_fcfi, (~phba->fcf.addr_mode) & 0x3);
-        if (phba->fcf.current_rec.vlan_id != 0xFFFF) {
+        if (phba->fcf.current_rec.vlan_id != LPFC_FCOE_NULL_VID) {
                 bf_set(lpfc_reg_fcfi_vv, reg_fcfi, 1);
                 bf_set(lpfc_reg_fcfi_vlan_tag, reg_fcfi,
                        phba->fcf.current_rec.vlan_id);