diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-08-22 19:24:46 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-08-22 19:24:46 +0000 |
| commit | 9898edf55a357cec37e2b881a1eb6aeef0e034ab (patch) | |
| tree | 21124c678b579e21e6ca3f4a14a74145b3c41c1a /sys/scsi | |
| parent | 5d40848c78930ff6f7ea0fd9a1d97688e9c1bc00 (diff) | |
check for scsi_autoconf state, spotted by marco; ok krw
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/safte.c | 5 | ||||
| -rw-r--r-- | sys/scsi/ses.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/scsi/safte.c b/sys/scsi/safte.c index 3dbf5f5911e..78ee318a84a 100644 --- a/sys/scsi/safte.c +++ b/sys/scsi/safte.c @@ -1,4 +1,4 @@ -/* $OpenBSD: safte.c,v 1.13 2005/08/21 23:28:59 deraadt Exp $ */ +/* $OpenBSD: safte.c,v 1.14 2005/08/22 19:24:45 deraadt Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -286,6 +286,9 @@ safte_read_config(struct safte_softc *sc) flags |= SCSI_SILENT; #endif + if (scsi_autoconf) + flags |= SCSI_AUTOCONF; + if (scsi_scsi_cmd(sc->sc_link, (struct scsi_generic *)&cmd, sizeof(cmd), (u_char *)&config, sizeof(config), 2, 30000, NULL, flags) != 0) diff --git a/sys/scsi/ses.c b/sys/scsi/ses.c index d7ce4dd2f51..f8c3d4ade83 100644 --- a/sys/scsi/ses.c +++ b/sys/scsi/ses.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ses.c,v 1.23 2005/08/18 21:04:47 marco Exp $ */ +/* $OpenBSD: ses.c,v 1.24 2005/08/22 19:24:45 deraadt Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -306,6 +306,9 @@ ses_read_config(struct ses_softc *sc) flags |= SCSI_SILENT; #endif + if (scsi_autoconf) + flags |= SCSI_AUTOCONF; + if (scsi_scsi_cmd(sc->sc_link, (struct scsi_generic *)&cmd, sizeof(cmd), buf, SES_BUFLEN, 2, 3000, NULL, flags) != 0) { free(buf, M_DEVBUF); |