summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2008-06-01 15:49:26 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2008-06-01 15:49:26 +0000
commite36e9b532a339d0c6ec3ad4de0ce9f8b080d240c (patch)
tree39fa2dd6d7f107d6d9571f55bdda5557d86b012e /sys/arch
parentea2b13562c5d2ee5ccf734f7ce9336d4bf9a5bd1 (diff)
Make SCSI isp(4) use the same SCSI initiator ID as the prom on sparc/sparc64.
ok marco@, krw@, deraadt@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sparc/dev/isp_sbus.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/arch/sparc/dev/isp_sbus.c b/sys/arch/sparc/dev/isp_sbus.c
index f13bb7b37b0..5b70de874bf 100644
--- a/sys/arch/sparc/dev/isp_sbus.c
+++ b/sys/arch/sparc/dev/isp_sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_sbus.c,v 1.24 2004/09/29 07:35:11 miod Exp $ */
+/* $OpenBSD: isp_sbus.c,v 1.25 2008/06/01 15:49:25 kettenis Exp $ */
/*
* SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
*
@@ -176,6 +176,9 @@ isp_sbus_attach(struct device *parent, struct device *self, void *aux)
}
sbc->sbus_mdvec.dv_clock = freq;
+ DEFAULT_IID(isp) =
+ getpropint(ca->ca_ra.ra_node, "scsi-initiator-id", 7);
+
if ((bp = ca->ca_ra.ra_bp) != NULL) {
if (bp->val[0] == ca->ca_slot &&
bp->val[1] == ca->ca_offset) {