[SCSI] qla1280.c - fix result for device Busy and Queue Full
authorJeremy Higdon <jeremy@sgi.com>
Sun, 1 May 2005 12:18:48 +0000 (05:18 -0700)
committerJames Bottomley <jejb@mulgrave.(none)>
Fri, 20 May 2005 17:53:43 +0000 (12:53 -0500)
I discovered that the qla1280 driver does not send the correct status
to the midlayer when it gets Queue Full or Busy from a device.

Signed-off-by: Jeremy Higdon <jeremy@sgi.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/scsi/qla1280.c

index 4ad28081499085c859be8b32eec825217cd5d90b..653e589b7d7f8f32e9988c2fe8be48e7f99138b2 100644 (file)
@@ -4038,11 +4038,10 @@ qla1280_status_entry(struct scsi_qla_host *ha, struct response *pkt,
                        scsi_status, handle);
        }
 
-       /* Target busy */
-       if (scsi_status & SS_BUSY_CONDITION &&
-           scsi_status != SS_RESERVE_CONFLICT) {
-               CMD_RESULT(cmd) =
-                       DID_BUS_BUSY << 16 | (scsi_status & 0xff);
+       /* Target busy or queue full */
+       if ((scsi_status & 0xFF) == SAM_STAT_TASK_SET_FULL ||
+           (scsi_status & 0xFF) == SAM_STAT_BUSY) {
+               CMD_RESULT(cmd) = scsi_status & 0xff;
        } else {
 
                /* Save ISP completion status */