diff options
| author |   krw <krw@openbsd.org> | 2006-07-22 18:03:07 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2006-07-22 18:03:07 +0000 |
| commit | e906bcd8851a0035ae71119bf28bb59d39becc2a (patch) | |
| tree | 3e0e41c894b68e9625f2e5e8cea6c0747f21cbff /sys/scsi/scsiconf.c | |
| parent | corrections from alexey e. suslikov; (diff) | |
| download | wireguard-openbsd-e906bcd8851a0035ae71119bf28bb59d39becc2a.tar.xz wireguard-openbsd-e906bcd8851a0035ae71119bf28bb59d39becc2a.zip | |
Nuke SCSIFORCELUN* and friends. These were introduced as a safety
valve in case our duplicate LUN checks had to be circumvented. Since
no one has found a need for them, and they were just one more place
trying to shift a bit 255 places to the left could be induced, remove
them.
"i don't think any options like that are worthwhile" deraadt@
Diffstat (limited to 'sys/scsi/scsiconf.c')
| -rw-r--r-- | sys/scsi/scsiconf.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index f2e60553df1..dfcec389ef8 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.c,v 1.107 2006/07/14 01:27:40 krw Exp $ */ +/* $OpenBSD: scsiconf.c,v 1.108 2006/07/22 18:03:07 krw Exp $ */ /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */ /* @@ -90,9 +90,6 @@ int scsidebug_targets = SCSIDEBUG_TARGETS; int scsidebug_luns = SCSIDEBUG_LUNS; int scsidebug_level = SCSIDEBUG_LEVEL; -int scsiforcelun_buses = SCSIFORCELUN_BUSES; -int scsiforcelun_targets = SCSIFORCELUN_TARGETS; - int scsi_autoconf = SCSI_AUTOCONF; int scsibusprint(void *, const char *); @@ -608,9 +605,6 @@ scsi_probedev(struct scsibus_softc *scsi, int target, int lun) if (lun == 0 || scsi->sc_link[target][0] == NULL) ; - else if (((1 << sc_link->scsibus) & scsiforcelun_buses) && - ((1 << target) & scsiforcelun_targets)) - ; else if (sc_link->flags & SDEV_UMASS) ; else if (memcmp(&inqbuf, &scsi->sc_link[target][0]->inqdata, |