diff options
author | James Smart <James.Smart@Emulex.Com> | 2007-10-27 13:37:25 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-11 19:22:32 -0500 |
commit | 0b727fea7a700e223bf52fb1eaf4c3a27c4340db (patch) | |
tree | ff4eb6c5ab0ac7c3b2a299f037d1b73224a07c9e /drivers/scsi/lpfc/lpfc_els.c | |
parent | 7ee5d43e2ea25336a7638715420c75583bd2ed69 (diff) |
[SCSI] lpfc 8.2.3 : Remove flawed MBX_STOP_IOCB logic
Remove flawed MBX_STOP_IOCB logic
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_els.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_els.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index 8085900635d4..b73612d4fc53 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c | |||
@@ -249,7 +249,7 @@ lpfc_issue_fabric_reglogin(struct lpfc_vport *vport) | |||
249 | mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl; | 249 | mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl; |
250 | mbox->vport = vport; | 250 | mbox->vport = vport; |
251 | 251 | ||
252 | rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT | MBX_STOP_IOCB); | 252 | rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT); |
253 | if (rc == MBX_NOT_FINISHED) | 253 | if (rc == MBX_NOT_FINISHED) |
254 | goto fail_free_mbox; | 254 | goto fail_free_mbox; |
255 | 255 | ||
@@ -265,7 +265,7 @@ lpfc_issue_fabric_reglogin(struct lpfc_vport *vport) | |||
265 | mbox->vport = vport; | 265 | mbox->vport = vport; |
266 | mbox->context2 = lpfc_nlp_get(ndlp); | 266 | mbox->context2 = lpfc_nlp_get(ndlp); |
267 | 267 | ||
268 | rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT | MBX_STOP_IOCB); | 268 | rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT); |
269 | if (rc == MBX_NOT_FINISHED) | 269 | if (rc == MBX_NOT_FINISHED) |
270 | goto fail_issue_reg_login; | 270 | goto fail_issue_reg_login; |
271 | 271 | ||
@@ -429,8 +429,7 @@ lpfc_cmpl_els_flogi_nport(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, | |||
429 | 429 | ||
430 | mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl; | 430 | mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl; |
431 | mbox->vport = vport; | 431 | mbox->vport = vport; |
432 | rc = lpfc_sli_issue_mbox(phba, mbox, | 432 | rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT); |
433 | MBX_NOWAIT | MBX_STOP_IOCB); | ||
434 | if (rc == MBX_NOT_FINISHED) { | 433 | if (rc == MBX_NOT_FINISHED) { |
435 | mempool_free(mbox, phba->mbox_mem_pool); | 434 | mempool_free(mbox, phba->mbox_mem_pool); |
436 | goto fail; | 435 | goto fail; |
@@ -2150,8 +2149,7 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
2150 | lpfc_nlp_set_state(vport, ndlp, | 2149 | lpfc_nlp_set_state(vport, ndlp, |
2151 | NLP_STE_REG_LOGIN_ISSUE); | 2150 | NLP_STE_REG_LOGIN_ISSUE); |
2152 | } | 2151 | } |
2153 | if (lpfc_sli_issue_mbox(phba, mbox, | 2152 | if (lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT) |
2154 | (MBX_NOWAIT | MBX_STOP_IOCB)) | ||
2155 | != MBX_NOT_FINISHED) { | 2153 | != MBX_NOT_FINISHED) { |
2156 | goto out; | 2154 | goto out; |
2157 | } | 2155 | } |
@@ -3022,8 +3020,7 @@ lpfc_els_rcv_flogi(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, | |||
3022 | mbox->mb.un.varInitLnk.lipsr_AL_PA = 0; | 3020 | mbox->mb.un.varInitLnk.lipsr_AL_PA = 0; |
3023 | mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl; | 3021 | mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl; |
3024 | mbox->vport = vport; | 3022 | mbox->vport = vport; |
3025 | rc = lpfc_sli_issue_mbox | 3023 | rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT); |
3026 | (phba, mbox, (MBX_NOWAIT | MBX_STOP_IOCB)); | ||
3027 | lpfc_set_loopback_flag(phba); | 3024 | lpfc_set_loopback_flag(phba); |
3028 | if (rc == MBX_NOT_FINISHED) { | 3025 | if (rc == MBX_NOT_FINISHED) { |
3029 | mempool_free(mbox, phba->mbox_mem_pool); | 3026 | mempool_free(mbox, phba->mbox_mem_pool); |
@@ -3223,8 +3220,8 @@ lpfc_els_rcv_rps(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, | |||
3223 | mbox->context2 = lpfc_nlp_get(ndlp); | 3220 | mbox->context2 = lpfc_nlp_get(ndlp); |
3224 | mbox->vport = vport; | 3221 | mbox->vport = vport; |
3225 | mbox->mbox_cmpl = lpfc_els_rsp_rps_acc; | 3222 | mbox->mbox_cmpl = lpfc_els_rsp_rps_acc; |
3226 | if (lpfc_sli_issue_mbox (phba, mbox, | 3223 | if (lpfc_sli_issue_mbox (phba, mbox, MBX_NOWAIT) |
3227 | (MBX_NOWAIT | MBX_STOP_IOCB)) != MBX_NOT_FINISHED) | 3224 | != MBX_NOT_FINISHED) |
3228 | /* Mbox completion will send ELS Response */ | 3225 | /* Mbox completion will send ELS Response */ |
3229 | return 0; | 3226 | return 0; |
3230 | 3227 | ||
@@ -4162,8 +4159,7 @@ lpfc_register_new_vport(struct lpfc_hba *phba, struct lpfc_vport *vport, | |||
4162 | mbox->vport = vport; | 4159 | mbox->vport = vport; |
4163 | mbox->context2 = lpfc_nlp_get(ndlp); | 4160 | mbox->context2 = lpfc_nlp_get(ndlp); |
4164 | mbox->mbox_cmpl = lpfc_cmpl_reg_new_vport; | 4161 | mbox->mbox_cmpl = lpfc_cmpl_reg_new_vport; |
4165 | if (lpfc_sli_issue_mbox(phba, mbox, | 4162 | if (lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT) |
4166 | MBX_NOWAIT | MBX_STOP_IOCB) | ||
4167 | == MBX_NOT_FINISHED) { | 4163 | == MBX_NOT_FINISHED) { |
4168 | mempool_free(mbox, phba->mbox_mem_pool); | 4164 | mempool_free(mbox, phba->mbox_mem_pool); |
4169 | vport->fc_flag &= ~FC_VPORT_NEEDS_REG_VPI; | 4165 | vport->fc_flag &= ~FC_VPORT_NEEDS_REG_VPI; |