diff options
| author |   matthew <matthew@openbsd.org> | 2011-07-17 22:46:47 +0000 |
|---|---|---|
| committer | matthew <matthew@openbsd.org> | 2011-07-17 22:46:47 +0000 |
| commit | 3ba30b1bc6606186b78adb0373ac3c83c82ed540 (patch) | |
| tree | 5d0a100ee78cd2f1a9e8639fa58a1de99d475bfb /sys/dev/softraid.c | |
| parent | Fix an integer overflow for very long lines by replacing the datatype of 2 offsets from int to regoff_t. (diff) | |
| download | wireguard-openbsd-3ba30b1bc6606186b78adb0373ac3c83c82ed540.tar.xz wireguard-openbsd-3ba30b1bc6606186b78adb0373ac3c83c82ed540.zip | |
Backout a bunch of my SCSI commits from c2k11. At least one of these
is causing problems when trying to boot sparc64 from an isp(4).
Verified to fix the sparc64/isp(4) regression by krw@; ok deraadt@
Diffstat (limited to 'sys/dev/softraid.c')
| -rw-r--r-- | sys/dev/softraid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index fd6cb8514fd..a59f5ef5c73 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.244 2011/07/08 22:09:27 matthew Exp $ */ +/* $OpenBSD: softraid.c,v 1.245 2011/07/17 22:46:48 matthew Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -1662,11 +1662,11 @@ sr_attach(struct device *parent, struct device *self, void *aux) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter = &sr_switch; sc->sc_link.adapter_target = SR_MAX_LD; + sc->sc_link.adapter_buswidth = SR_MAX_LD; + sc->sc_link.luns = 1; bzero(&saa, sizeof(saa)); saa.saa_sc_link = &sc->sc_link; - saa.saa_targets = SR_MAX_LD; - saa.saa_luns = 1; sc->sc_scsibus = (struct scsibus_softc *)config_found(&sc->sc_dev, &saa, scsiprint); |