[SCSI] aic94xx: fix ABORT_TASK define conflict
include/scsi/scsi.h as a definition: #define ABORT_TASK 0x0d on the other hand drivers/scsi/aic94xx/aic94xx_sas.h has: #define ABORT_TASK 0x03 rename the latter to SCB_ABORT_TASK Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
parent
ccf9ea91ab
commit
90b0c41829
2 changed files with 2 additions and 2 deletions
|
@ -292,7 +292,7 @@ struct scb_header {
|
|||
#define INITIATE_SSP_TASK 0x00
|
||||
#define INITIATE_LONG_SSP_TASK 0x01
|
||||
#define INITIATE_BIDIR_SSP_TASK 0x02
|
||||
#define ABORT_TASK 0x03
|
||||
#define SCB_ABORT_TASK 0x03
|
||||
#define INITIATE_SSP_TMF 0x04
|
||||
#define SSP_TARG_GET_DATA 0x05
|
||||
#define SSP_TARG_GET_DATA_GOOD 0x06
|
||||
|
|
|
@ -369,7 +369,7 @@ int asd_abort_task(struct sas_task *task)
|
|||
return -ENOMEM;
|
||||
scb = ascb->scb;
|
||||
|
||||
scb->header.opcode = ABORT_TASK;
|
||||
scb->header.opcode = SCB_ABORT_TASK;
|
||||
|
||||
switch (task->task_proto) {
|
||||
case SAS_PROTOCOL_SATA:
|
||||
|
|
Loading…
Reference in a new issue