From 898fa618fe8d3adb71a0e21248b9d34a2114b0b4 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 4 Jul 2005 17:48:36 +0200 Subject: [PATCH] --- yaml --- r: 7653 b: refs/heads/master c: d6db3e8d5fe3178776d0a0314e612c3f55e55fb4 h: refs/heads/master i: 7651: 07bd92b6230e88262d6436366f62ce013742f8cc v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla1280.c | 2 +- trunk/drivers/scsi/qla1280.h | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 4629f4b8a2b0..b42f869fd1fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b55cac3d2d9f545c141748d00eae86e2c042ca5 +refs/heads/master: d6db3e8d5fe3178776d0a0314e612c3f55e55fb4 diff --git a/trunk/drivers/scsi/qla1280.c b/trunk/drivers/scsi/qla1280.c index e5354550d762..3732230b2e3a 100644 --- a/trunk/drivers/scsi/qla1280.c +++ b/trunk/drivers/scsi/qla1280.c @@ -4049,7 +4049,7 @@ qla1280_status_entry(struct scsi_qla_host *ha, struct response *pkt, /* Save ISP completion status */ CMD_RESULT(cmd) = qla1280_return_status(pkt, cmd); - if (scsi_status & SS_CHECK_CONDITION) { + if (scsi_status & SAM_STAT_CHECK_CONDITION) { if (comp_status != CS_ARS_FAILED) { uint16_t req_sense_length = le16_to_cpu(pkt->req_sense_length); diff --git a/trunk/drivers/scsi/qla1280.h b/trunk/drivers/scsi/qla1280.h index 1c1cf3a5af03..0d430d63be40 100644 --- a/trunk/drivers/scsi/qla1280.h +++ b/trunk/drivers/scsi/qla1280.h @@ -978,14 +978,6 @@ struct ctio_a64_ret_entry { #define CS_UNKNOWN 0x81 /* Driver defined */ #define CS_RETRY 0x82 /* Driver defined */ -/* - * ISP status entry - SCSI status byte bit definitions. - */ -#define SS_CHECK_CONDITION BIT_1 -#define SS_CONDITION_MET BIT_2 -#define SS_BUSY_CONDITION BIT_3 -#define SS_RESERVE_CONFLICT (BIT_4 | BIT_3) - /* * ISP target entries - Option flags bit definitions. */