summaryrefslogtreecommitdiffstats
path: root/sys/dev/softraid.c
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2020-07-20 14:41:12 +0000
committerkrw <krw@openbsd.org>2020-07-20 14:41:12 +0000
commite5eae15db860eeb4c34d7bbe32da7a39dae6ff2a (patch)
tree498cfd25bdc5ba0d876f4e5371f5798b6a749227 /sys/dev/softraid.c
parentSigh. Only the ptyc case should tsleep in ttyretype, since others can (diff)
downloadwireguard-openbsd-e5eae15db860eeb4c34d7bbe32da7a39dae6ff2a.tar.xz
wireguard-openbsd-e5eae15db860eeb4c34d7bbe32da7a39dae6ff2a.zip
Move remaining scsi bus initialization info from "prototype scsi link"
fields to struct scsibus_attach_args. Nuke the struct scsi_link * (saa_sc_link) in scaibus_attach_args. Explicitly initialize each field in scsibus_attach_args variables.
Diffstat (limited to 'sys/dev/softraid.c')
-rw-r--r--sys/dev/softraid.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index a42c676e2f6..893fb4838a9 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.409 2020/07/19 18:57:57 krw Exp $ */
+/* $OpenBSD: softraid.c,v 1.410 2020/07/20 14:41:12 krw Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -1802,12 +1802,15 @@ sr_attach(struct device *parent, struct device *self, void *aux)
printf("\n");
- saa.saa_sc_link = &sc->sc_link;
saa.saa_adapter_softc = sc;
saa.saa_adapter = &sr_switch;
saa.saa_adapter_target = SDEV_NO_ADAPTER_TARGET;
saa.saa_adapter_buswidth = SR_MAX_LD;
saa.saa_luns = 1;
+ saa.saa_openings = 0;
+ saa.saa_pool = NULL;
+ saa.saa_quirks = saa.saa_flags = 0;
+ saa.saa_wwpn = saa.saa_wwnn = 0;
sc->sc_scsibus = (struct scsibus_softc *)config_found(&sc->sc_dev, &saa,
scsiprint);