Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90b0c418 authored by Boaz Harrosh's avatar Boaz Harrosh Committed by James Bottomley
Browse files

[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: default avatarBoaz Harrosh <bharrosh@panasas.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent ccf9ea91

drivers/scsi/aic94xx/aic94xx_sas.h

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/scsi/aic94xx/aic94xx_tmf.c

+1 −1
Original line number Diff line number Diff line
@@ -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: