summaryrefslogtreecommitdiff
path: root/sys/dev/ic/aic79xx_openbsd.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2009-11-22 14:14:12 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2009-11-22 14:14:12 +0000
commit2c11f73dede318e822acc869f050872a3bce9c59 (patch)
treebc79276a3887621718c2b035dc5adbf2daf52b93 /sys/dev/ic/aic79xx_openbsd.c
parentccc027bb2ba3e9fb45f59ef7ce17214694d0f665 (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/aic79xx_openbsd.c')
-rw-r--r--sys/dev/ic/aic79xx_openbsd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ic/aic79xx_openbsd.c b/sys/dev/ic/aic79xx_openbsd.c
index 0ec3a78ac6c..f9f9bb1397c 100644
--- a/sys/dev/ic/aic79xx_openbsd.c
+++ b/sys/dev/ic/aic79xx_openbsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic79xx_openbsd.c,v 1.32 2009/02/16 21:19:06 miod Exp $ */
+/* $OpenBSD: aic79xx_openbsd.c,v 1.33 2009/11/22 14:14:10 krw Exp $ */
/*
* Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -574,7 +574,7 @@ ahd_setup_data(struct ahd_softc *ahd, struct scsi_xfer *xs,
ahd_lock(ahd, &s);
ahd_free_scb(ahd, scb);
ahd_unlock(ahd, &s);
- return (TRY_AGAIN_LATER); /* XXX fvdl */
+ return (NO_CCB); /* XXX fvdl */
}
error = ahd_execute_scb(scb, scb->dmamap->dm_segs,
scb->dmamap->dm_nsegs);