From 6b8b19aaaf22e601e0194faef24d942d6e6b3f72 Mon Sep 17 00:00:00 2001
From: David Gwynne <dlg@cvs.openbsd.org>
Date: Mon, 20 Sep 2010 00:19:48 +0000
Subject: bring back scsi_base.c r1.195 and scsiconf.h r1.138 now that
 src/sys/dev/ata/atascsi.c r1.92 solves the problem that my scsi_link change
 tickled.

tested by josh elsasser who reported the problem in pr6470
deraadt@ is letting it in again so it can get widespread testing
---
 sys/scsi/scsiconf.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sys/scsi/scsiconf.h')

diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index 1c38b9ded84..21be0e0f57f 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsiconf.h,v 1.139 2010/09/17 23:19:02 dlg Exp $	*/
+/*	$OpenBSD: scsiconf.h,v 1.140 2010/09/20 00:19:47 dlg Exp $	*/
 /*	$NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $	*/
 
 /*
@@ -396,6 +396,7 @@ struct scsi_link {
 
 	struct	scsi_runq queue;
 	u_int	running;
+	u_short	pending;
 
 	struct	scsi_iopool *pool;
 };
-- 
cgit v1.2.3