diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-12-06 17:24:29 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-12-06 17:24:29 +0000 |
| commit | 7fb64f8c55eb07b0bee7925ab053db98f596eabd (patch) | |
| tree | 16dd60b85d61efb49c51f1957acf03efc6ff2fd2 /sys | |
| parent | 557cd33b24444ce3ede41fb6a0eec98f64295ebd (diff) | |
Nuke SCSI_URGENT after removing its only use, in ncr53c9x.c. That use
was to try to play dangerous games with tagged queuing.
ok marco@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/ncr53c9x.c | 4 | ||||
| -rw-r--r-- | sys/scsi/scsiconf.h | 3 | ||||
| -rw-r--r-- | sys/scsi/sd.c | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c index b6f9b4cdeb5..65ee11bc53f 100644 --- a/sys/dev/ic/ncr53c9x.c +++ b/sys/dev/ic/ncr53c9x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr53c9x.c,v 1.42 2009/11/22 14:14:10 krw Exp $ */ +/* $OpenBSD: ncr53c9x.c,v 1.43 2009/12/06 17:24:28 krw Exp $ */ /* $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $ */ /* @@ -942,8 +942,6 @@ ncr53c9x_sched(sc) tag = 0; else if ((ecb->flags & ECB_SENSE) != 0) tag = 0; - else if (ecb->xs->flags & SCSI_URGENT) - tag = MSG_HEAD_OF_Q_TAG; else tag = MSG_SIMPLE_Q_TAG; #if 0 diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index f3785e02416..96d5ea7dc47 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.h,v 1.114 2009/12/06 09:35:16 dlg Exp $ */ +/* $OpenBSD: scsiconf.h,v 1.115 2009/12/06 17:24:28 krw Exp $ */ /* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */ /* @@ -474,7 +474,6 @@ struct scsi_xfer { #define SCSI_DATA_OUT 0x01000 /* expect data to flow OUT of memory */ #define SCSI_TARGET 0x02000 /* This defines a TARGET mode op. */ #define SCSI_ESCAPE 0x04000 /* Escape operation */ -#define SCSI_URGENT 0x08000 /* Urgent operation (e.g., HTAG) */ #define SCSI_PRIVATE 0xf0000 /* private to each HBA flags */ /* diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index e86801a2d15..f532a6cf945 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.171 2009/12/06 07:26:35 dlg Exp $ */ +/* $OpenBSD: sd.c,v 1.172 2009/12/06 17:24:28 krw Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -1153,7 +1153,7 @@ sd_interpret_sense(struct scsi_xfer *xs) case SENSE_NOT_READY_INIT_REQUIRED: SC_DEBUG(sc_link, SDEV_DB1, ("spinning up\n")); retval = scsi_start(sc->sc_link, SSS_START, - SCSI_IGNORE_ILLEGAL_REQUEST | SCSI_URGENT | SCSI_NOSLEEP); + SCSI_IGNORE_ILLEGAL_REQUEST | SCSI_NOSLEEP); if (retval == 0) retval = ERESTART; else |