From 3bf02812c56c677e002e0200d73648a03f753afb Mon Sep 17 00:00:00 2001 From: Kenneth R Westerback Date: Tue, 28 Dec 2004 04:12:25 +0000 Subject: Don't allow an infinite number of SCSI bus resets per i/o. ok marco@. --- sys/dev/ic/aic79xx_openbsd.c | 3 ++- sys/dev/ic/aic7xxx_openbsd.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/ic/aic79xx_openbsd.c b/sys/dev/ic/aic79xx_openbsd.c index 2f969240b5a..9d00225b80a 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.18 2004/12/27 21:34:42 krw Exp $ */ +/* $OpenBSD: aic79xx_openbsd.c,v 1.19 2004/12/28 04:12:24 krw Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -257,6 +257,7 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb) case CAM_BDR_SENT: case CAM_SCSI_BUS_RESET: xs->error = XS_RESET; + break; case CAM_REQUEUE_REQ: xs->error = XS_TIMEOUT; xs->retries++; diff --git a/sys/dev/ic/aic7xxx_openbsd.c b/sys/dev/ic/aic7xxx_openbsd.c index 664fe3f1dfe..dd8b778757d 100644 --- a/sys/dev/ic/aic7xxx_openbsd.c +++ b/sys/dev/ic/aic7xxx_openbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx_openbsd.c,v 1.25 2004/10/24 04:28:33 krw Exp $ */ +/* $OpenBSD: aic7xxx_openbsd.c,v 1.26 2004/12/28 04:12:24 krw Exp $ */ /* $NetBSD: aic7xxx_osm.c,v 1.14 2003/11/02 11:07:44 wiz Exp $ */ /* @@ -274,6 +274,7 @@ ahc_done(struct ahc_softc *ahc, struct scb *scb) case CAM_BDR_SENT: case CAM_SCSI_BUS_RESET: xs->error = XS_RESET; + break; case CAM_REQUEUE_REQ: xs->error = XS_TIMEOUT; xs->retries++; -- cgit v1.2.3