Signed-off-by: Christoph Hellwig <[EMAIL PROTECTED]>
Signed-off-by: Thiemo Seufer <[EMAIL PROTECTED]>

Index: linux-2.6/drivers/scsi/qla1280.c
===================================================================
--- linux-2.6.orig/drivers/scsi/qla1280.c       2005-06-19 21:12:55.000000000 
+0200
+++ linux-2.6/drivers/scsi/qla1280.c    2005-06-19 21:14:45.000000000 +0200
@@ -4049,7 +4049,7 @@
                /* 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);
Index: linux-2.6/drivers/scsi/qla1280.h
===================================================================
--- linux-2.6.orig/drivers/scsi/qla1280.h       2005-06-19 20:48:36.000000000 
+0200
+++ linux-2.6/drivers/scsi/qla1280.h    2005-06-19 21:14:52.000000000 +0200
@@ -979,14 +979,6 @@
 #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.
  */
 #define OF_ENABLE_TAG       BIT_1      /* Tagged queue action enable */
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to