aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmen Baloyan <armen.baloyan@qlogic.com>2014-02-26 04:14:58 -0500
committerJames Bottomley <JBottomley@Parallels.com>2014-03-15 13:17:48 -0400
commitb593931d6909d45bd186d53409808d3b38d20c6d (patch)
tree68a47e83c577388b5b16a9e92c9f094ebae3d51d
parent0f8cdff567357fe7280963bc90e17e97dad995cd (diff)
[SCSI] qla2xxx: Replace constant value for IOCTL IOCB abort execution status with a macro for ISPFX00.
Signed-off-by: Armen Baloyan <armen.baloyan@qlogic.com> Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--drivers/scsi/qla2xxx/qla_mr.c3
-rw-r--r--drivers/scsi/qla2xxx/qla_mr.h3
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index 6ca4807ffb92..7c7849d54a09 100644
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -2017,7 +2017,8 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type)
2017 memcpy(vha->hw->gid_list, pinfo, QLAFX00_TGT_NODE_LIST_SIZE); 2017 memcpy(vha->hw->gid_list, pinfo, QLAFX00_TGT_NODE_LIST_SIZE);
2018 } else if (fx_type == FXDISC_ABORT_IOCTL) 2018 } else if (fx_type == FXDISC_ABORT_IOCTL)
2019 fdisc->u.fxiocb.result = 2019 fdisc->u.fxiocb.result =
2020 (fdisc->u.fxiocb.result == cpu_to_le32(0x68)) ? 2020 (fdisc->u.fxiocb.result ==
2021 cpu_to_le32(QLAFX00_IOCTL_ICOB_ABORT_SUCCESS)) ?
2021 cpu_to_le32(QLA_SUCCESS) : cpu_to_le32(QLA_FUNCTION_FAILED); 2022 cpu_to_le32(QLA_SUCCESS) : cpu_to_le32(QLA_FUNCTION_FAILED);
2022 2023
2023 rval = le32_to_cpu(fdisc->u.fxiocb.result); 2024 rval = le32_to_cpu(fdisc->u.fxiocb.result);
diff --git a/drivers/scsi/qla2xxx/qla_mr.h b/drivers/scsi/qla2xxx/qla_mr.h
index 6cd7072cc0ff..5f3ed8b48a51 100644
--- a/drivers/scsi/qla2xxx/qla_mr.h
+++ b/drivers/scsi/qla2xxx/qla_mr.h
@@ -548,4 +548,7 @@ struct mr_data_fx00 {
548/* Max conncurrent IOs that can be queued */ 548/* Max conncurrent IOs that can be queued */
549#define QLAFX00_MAX_CANQUEUE 1024 549#define QLAFX00_MAX_CANQUEUE 1024
550 550
551/* IOCTL IOCB abort success */
552#define QLAFX00_IOCTL_ICOB_ABORT_SUCCESS 0x68
553
551#endif 554#endif