diff options
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_sli.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_sli.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index c7a520fa1aa..857bc0a57c4 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c | |||
@@ -1050,6 +1050,8 @@ lpfc_sli_chk_mbx_command(uint8_t mbxCommand) | |||
1050 | case MBX_REG_VPI: | 1050 | case MBX_REG_VPI: |
1051 | case MBX_UNREG_VPI: | 1051 | case MBX_UNREG_VPI: |
1052 | case MBX_HEARTBEAT: | 1052 | case MBX_HEARTBEAT: |
1053 | case MBX_PORT_CAPABILITIES: | ||
1054 | case MBX_PORT_IOV_CONTROL: | ||
1053 | ret = mbxCommand; | 1055 | ret = mbxCommand; |
1054 | break; | 1056 | break; |
1055 | default: | 1057 | default: |
@@ -3697,6 +3699,16 @@ __lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
3697 | * can be issued if the link is not up. | 3699 | * can be issued if the link is not up. |
3698 | */ | 3700 | */ |
3699 | switch (piocb->iocb.ulpCommand) { | 3701 | switch (piocb->iocb.ulpCommand) { |
3702 | case CMD_GEN_REQUEST64_CR: | ||
3703 | case CMD_GEN_REQUEST64_CX: | ||
3704 | if (!(phba->sli.sli_flag & LPFC_MENLO_MAINT) || | ||
3705 | (piocb->iocb.un.genreq64.w5.hcsw.Rctl != | ||
3706 | FC_FCP_CMND) || | ||
3707 | (piocb->iocb.un.genreq64.w5.hcsw.Type != | ||
3708 | MENLO_TRANSPORT_TYPE)) | ||
3709 | |||
3710 | goto iocb_busy; | ||
3711 | break; | ||
3700 | case CMD_QUE_RING_BUF_CN: | 3712 | case CMD_QUE_RING_BUF_CN: |
3701 | case CMD_QUE_RING_BUF64_CN: | 3713 | case CMD_QUE_RING_BUF64_CN: |
3702 | /* | 3714 | /* |