diff options
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_init.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_init.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 02d8731eb365..a018649c408f 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c | |||
@@ -10938,7 +10938,7 @@ lpfc_sli4_oas_verify(struct lpfc_hba *phba) | |||
10938 | if (phba->sli4_hba.pc_sli4_params.oas_supported) { | 10938 | if (phba->sli4_hba.pc_sli4_params.oas_supported) { |
10939 | phba->cfg_fof = 1; | 10939 | phba->cfg_fof = 1; |
10940 | } else { | 10940 | } else { |
10941 | phba->cfg_EnableXLane = 0; | 10941 | phba->cfg_fof = 0; |
10942 | if (phba->device_data_mem_pool) | 10942 | if (phba->device_data_mem_pool) |
10943 | mempool_destroy(phba->device_data_mem_pool); | 10943 | mempool_destroy(phba->device_data_mem_pool); |
10944 | phba->device_data_mem_pool = NULL; | 10944 | phba->device_data_mem_pool = NULL; |
@@ -10968,7 +10968,7 @@ lpfc_fof_queue_setup(struct lpfc_hba *phba) | |||
10968 | if (rc) | 10968 | if (rc) |
10969 | return -ENOMEM; | 10969 | return -ENOMEM; |
10970 | 10970 | ||
10971 | if (phba->cfg_EnableXLane) { | 10971 | if (phba->cfg_fof) { |
10972 | 10972 | ||
10973 | rc = lpfc_cq_create(phba, phba->sli4_hba.oas_cq, | 10973 | rc = lpfc_cq_create(phba, phba->sli4_hba.oas_cq, |
10974 | phba->sli4_hba.fof_eq, LPFC_WCQ, LPFC_FCP); | 10974 | phba->sli4_hba.fof_eq, LPFC_WCQ, LPFC_FCP); |
@@ -10987,8 +10987,7 @@ lpfc_fof_queue_setup(struct lpfc_hba *phba) | |||
10987 | return 0; | 10987 | return 0; |
10988 | 10988 | ||
10989 | out_oas_wq: | 10989 | out_oas_wq: |
10990 | if (phba->cfg_EnableXLane) | 10990 | lpfc_cq_destroy(phba, phba->sli4_hba.oas_cq); |
10991 | lpfc_cq_destroy(phba, phba->sli4_hba.oas_cq); | ||
10992 | out_oas_cq: | 10991 | out_oas_cq: |
10993 | lpfc_eq_destroy(phba, phba->sli4_hba.fof_eq); | 10992 | lpfc_eq_destroy(phba, phba->sli4_hba.fof_eq); |
10994 | return rc; | 10993 | return rc; |
@@ -11022,7 +11021,7 @@ lpfc_fof_queue_create(struct lpfc_hba *phba) | |||
11022 | 11021 | ||
11023 | phba->sli4_hba.fof_eq = qdesc; | 11022 | phba->sli4_hba.fof_eq = qdesc; |
11024 | 11023 | ||
11025 | if (phba->cfg_EnableXLane) { | 11024 | if (phba->cfg_fof) { |
11026 | 11025 | ||
11027 | /* Create OAS CQ */ | 11026 | /* Create OAS CQ */ |
11028 | qdesc = lpfc_sli4_queue_alloc(phba, phba->sli4_hba.cq_esize, | 11027 | qdesc = lpfc_sli4_queue_alloc(phba, phba->sli4_hba.cq_esize, |