[SCSI] lpfc 8.3.33: Change Naming convention for SLI4 Interrupt vector

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

3 files changed, 13 insertions, 1 deletions

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 3dad5ff870a8..538124b39767 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -8105,11 +8105,15 @@ enable_msix_vectors:
          * Assign MSI-X vectors to interrupt handlers
          */
         for (index = 0; index < vectors; index++) {
+                memset(&phba->sli4_hba.handler_name[index], 0, 16);
+                sprintf((char *)&phba->sli4_hba.handler_name[index],
+                         LPFC_DRIVER_HANDLER_NAME"%d", index);
+
                 phba->sli4_hba.fcp_eq_hdl[index].idx = index;
                 phba->sli4_hba.fcp_eq_hdl[index].phba = phba;
                 rc = request_irq(phba->sli4_hba.msix_entries[index].vector,
                                  &lpfc_sli4_hba_intr_handler, IRQF_SHARED,
-                                 LPFC_FP_DRIVER_HANDLER_NAME,
+                                 (char *)&phba->sli4_hba.handler_name[index],
                                  &phba->sli4_hba.fcp_eq_hdl[index]);
                 if (rc) {
                         lpfc_printf_log(phba, KERN_WARNING, LOG_INIT,
diff --git a/drivers/scsi/lpfc/lpfc_sli4.h b/drivers/scsi/lpfc/lpfc_sli4.h
index b4829d1d9e83..c806e66be55b 100644
--- a/drivers/scsi/lpfc/lpfc_sli4.h
+++ b/drivers/scsi/lpfc/lpfc_sli4.h
@@ -430,6 +430,8 @@ struct lpfc_sli4_lnk_info {
         uint8_t lnk_no;
 };
 
+#define LPFC_SLI4_HANDLER_NAME_SZ       16
+
 /* SLI4 HBA data structure entries */
 struct lpfc_sli4_hba {
         void __iomem *conf_regs_memmap_p; /* Kernel memory mapped address for
@@ -486,6 +488,7 @@ struct lpfc_sli4_hba {
         struct lpfc_register sli_intf;
         struct lpfc_pc_sli4_params pc_sli4_params;
         struct msix_entry *msix_entries;
+        uint8_t handler_name[LPFC_FCP_IO_CHAN_MAX][LPFC_SLI4_HANDLER_NAME_SZ];
         uint32_t cfg_eqn;
         uint32_t msix_vec_nr;
         struct lpfc_fcp_eq_hdl *fcp_eq_hdl; /* FCP per-WQ handle */
diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h
index 4704e5b5088e..77310405c8d1 100644
--- a/drivers/scsi/lpfc/lpfc_version.h
+++ b/drivers/scsi/lpfc/lpfc_version.h
@@ -20,9 +20,14 @@
 
 #define LPFC_DRIVER_VERSION "8.3.32"
 #define LPFC_DRIVER_NAME                "lpfc"
+
+/* Used for SLI 2/3 */
 #define LPFC_SP_DRIVER_HANDLER_NAME     "lpfc:sp"
 #define LPFC_FP_DRIVER_HANDLER_NAME     "lpfc:fp"
 
+/* Used for SLI4 */
+#define LPFC_DRIVER_HANDLER_NAME        "lpfc:"
+
 #define LPFC_MODULE_DESC "Emulex LightPulse Fibre Channel SCSI driver " \
                 LPFC_DRIVER_VERSION
 #define LPFC_COPYRIGHT "Copyright(c) 2004-2009 Emulex.  All rights reserved."