diff options
Diffstat (limited to 'drivers/scsi/aic94xx/aic94xx_tmf.c')
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_tmf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_tmf.c b/drivers/scsi/aic94xx/aic94xx_tmf.c index c0d0b7d7a8ce..87b2f6e6adfe 100644 --- a/drivers/scsi/aic94xx/aic94xx_tmf.c +++ b/drivers/scsi/aic94xx/aic94xx_tmf.c | |||
@@ -372,21 +372,21 @@ int asd_abort_task(struct sas_task *task) | |||
372 | scb->header.opcode = ABORT_TASK; | 372 | scb->header.opcode = ABORT_TASK; |
373 | 373 | ||
374 | switch (task->task_proto) { | 374 | switch (task->task_proto) { |
375 | case SATA_PROTO: | 375 | case SAS_PROTOCOL_SATA: |
376 | case SAS_PROTO_STP: | 376 | case SAS_PROTOCOL_STP: |
377 | scb->abort_task.proto_conn_rate = (1 << 5); /* STP */ | 377 | scb->abort_task.proto_conn_rate = (1 << 5); /* STP */ |
378 | break; | 378 | break; |
379 | case SAS_PROTO_SSP: | 379 | case SAS_PROTOCOL_SSP: |
380 | scb->abort_task.proto_conn_rate = (1 << 4); /* SSP */ | 380 | scb->abort_task.proto_conn_rate = (1 << 4); /* SSP */ |
381 | scb->abort_task.proto_conn_rate |= task->dev->linkrate; | 381 | scb->abort_task.proto_conn_rate |= task->dev->linkrate; |
382 | break; | 382 | break; |
383 | case SAS_PROTO_SMP: | 383 | case SAS_PROTOCOL_SMP: |
384 | break; | 384 | break; |
385 | default: | 385 | default: |
386 | break; | 386 | break; |
387 | } | 387 | } |
388 | 388 | ||
389 | if (task->task_proto == SAS_PROTO_SSP) { | 389 | if (task->task_proto == SAS_PROTOCOL_SSP) { |
390 | scb->abort_task.ssp_frame.frame_type = SSP_TASK; | 390 | scb->abort_task.ssp_frame.frame_type = SSP_TASK; |
391 | memcpy(scb->abort_task.ssp_frame.hashed_dest_addr, | 391 | memcpy(scb->abort_task.ssp_frame.hashed_dest_addr, |
392 | task->dev->hashed_sas_addr, HASHED_SAS_ADDR_SIZE); | 392 | task->dev->hashed_sas_addr, HASHED_SAS_ADDR_SIZE); |
@@ -512,7 +512,7 @@ static int asd_initiate_ssp_tmf(struct domain_device *dev, u8 *lun, | |||
512 | int res = 1; | 512 | int res = 1; |
513 | struct scb *scb; | 513 | struct scb *scb; |
514 | 514 | ||
515 | if (!(dev->tproto & SAS_PROTO_SSP)) | 515 | if (!(dev->tproto & SAS_PROTOCOL_SSP)) |
516 | return TMF_RESP_FUNC_ESUPP; | 516 | return TMF_RESP_FUNC_ESUPP; |
517 | 517 | ||
518 | ascb = asd_ascb_alloc_list(asd_ha, &res, GFP_KERNEL); | 518 | ascb = asd_ascb_alloc_list(asd_ha, &res, GFP_KERNEL); |