summaryrefslogtreecommitdiff
path: root/drivers/scsi/qla2xxx/qla_isr.c
diff options
context:
space:
mode:
authorDarren Trapp <darren.trapp@cavium.com>2018-03-21 09:09:32 +0300
committerMartin K. Petersen <martin.petersen@oracle.com>2018-03-22 01:38:54 +0300
commit9dd9686b14199a1c3e668e1cca124cd1c74b77e1 (patch)
treebbeef114969ada6e37e861525e8ce7b05cc2899e /drivers/scsi/qla2xxx/qla_isr.c
parentdbe18018e3ad60fc5abfe999b49c4b37f8e7bb32 (diff)
downloadlinux-9dd9686b14199a1c3e668e1cca124cd1c74b77e1.tar.xz
scsi: qla2xxx: Add changes for devloss timeout in driver
Add support for error recovery within devloss timeout, now that FC-NVMe transport support devloss timeout. Signed-off-by: Darren Trapp <darren.trapp@cavium.com> Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_isr.c')
-rw-r--r--drivers/scsi/qla2xxx/qla_isr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 16c43bd9bb83..93f2f1df7168 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1910,7 +1910,7 @@ qla24xx_nvme_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, void *tsk)
} else {
switch (le16_to_cpu(sts->comp_status)) {
case CS_COMPLETE:
- ret = 0;
+ ret = QLA_SUCCESS;
break;
case CS_ABORTED:
@@ -1922,7 +1922,8 @@ qla24xx_nvme_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, void *tsk)
"NVME-%s ERR Handling - hdl=%x completion status(%x) resid=%x ox_id=%x\n",
sp->name, sp->handle, sts->comp_status,
le32_to_cpu(sts->residual_len), sts->ox_id);
- fd->transferred_length = fd->payload_length;
+ fd->transferred_length = 0;
+ iocb->u.nvme.rsp_pyld_len = 0;
ret = QLA_ABORTED;
break;