diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-11-22 14:14:12 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-11-22 14:14:12 +0000 |
| commit | 2c11f73dede318e822acc869f050872a3bce9c59 (patch) | |
| tree | bc79276a3887621718c2b035dc5adbf2daf52b93 /sys/dev/ic/aac.c | |
| parent | ccc027bb2ba3e9fb45f59ef7ce17214694d0f665 (diff) | |
Bring last drivers fully into the NO_CCB world by replacing
TRY_AGAIN_LATER uses with equivalent NO_CCB. Eliminates confusion
between the two as was always intended. buf I/O's that can't be
started get pushed back onto the front of the queue and retried.
Others get sent back to originator as failures. No more epi-cycle
looping inside the SCSI midlayer hoping the problem goes away.
Various testers, no objection from miod@ as vs(4) was tested by
nick@.
Diffstat (limited to 'sys/dev/ic/aac.c')
| -rw-r--r-- | sys/dev/ic/aac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c index d3550e37e00..76c055b3352 100644 --- a/sys/dev/ic/aac.c +++ b/sys/dev/ic/aac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aac.c,v 1.40 2009/09/04 04:57:14 miod Exp $ */ +/* $OpenBSD: aac.c,v 1.41 2009/11/22 14:14:10 krw Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -2674,7 +2674,7 @@ aac_scsi_cmd(struct scsi_xfer *xs) printf("%s: command timed out\n", sc->aac_dev.dv_xname); splx(s); - return (TRY_AGAIN_LATER); + return (NO_CCB); } xs->flags |= ITSDONE; scsi_done(xs); |