diff options
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_sli.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_sli.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index 2da75d85de84..5417bc26f181 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c | |||
@@ -602,7 +602,7 @@ static struct lpfc_hbq_init lpfc_els_hbq = { | |||
602 | .add_count = 5, | 602 | .add_count = 5, |
603 | }; | 603 | }; |
604 | 604 | ||
605 | static struct lpfc_hbq_init *lpfc_hbq_defs[] = { | 605 | struct lpfc_hbq_init *lpfc_hbq_defs[] = { |
606 | &lpfc_els_hbq, | 606 | &lpfc_els_hbq, |
607 | }; | 607 | }; |
608 | 608 | ||
@@ -2136,7 +2136,7 @@ lpfc_sli_chipset_init(struct lpfc_hba *phba) | |||
2136 | return 0; | 2136 | return 0; |
2137 | } | 2137 | } |
2138 | 2138 | ||
2139 | static int | 2139 | int |
2140 | lpfc_sli_hbq_count(void) | 2140 | lpfc_sli_hbq_count(void) |
2141 | { | 2141 | { |
2142 | return ARRAY_SIZE(lpfc_hbq_defs); | 2142 | return ARRAY_SIZE(lpfc_hbq_defs); |
@@ -2309,7 +2309,7 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba) | |||
2309 | 2309 | ||
2310 | switch (lpfc_sli_mode) { | 2310 | switch (lpfc_sli_mode) { |
2311 | case 2: | 2311 | case 2: |
2312 | if (phba->cfg_npiv_enable) { | 2312 | if (phba->cfg_enable_npiv) { |
2313 | lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_VPORT, | 2313 | lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_VPORT, |
2314 | "1824 NPIV enabled: Override lpfc_sli_mode " | 2314 | "1824 NPIV enabled: Override lpfc_sli_mode " |
2315 | "parameter (%d) to auto (0).\n", | 2315 | "parameter (%d) to auto (0).\n", |