diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2014-03-07 22:39:09 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2014-03-07 22:39:09 +0000 |
| commit | b549fc52d1799de74aa633aca4ef272480a95356 (patch) | |
| tree | b2865a17154e35a0315dc99776570b0a19e3d931 /sys/dev/pci/qlw_pci.c | |
| parent | 4c26d533db46fd9ce60c0565529995ec30c8165c (diff) | |
Make sure a SCSI initiator ID provided by Open Firmware overrides the value
read from nvram, just like we did for isp(4).
Diffstat (limited to 'sys/dev/pci/qlw_pci.c')
| -rw-r--r-- | sys/dev/pci/qlw_pci.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/pci/qlw_pci.c b/sys/dev/pci/qlw_pci.c index a3afc83eca8..d5cbdf86b05 100644 --- a/sys/dev/pci/qlw_pci.c +++ b/sys/dev/pci/qlw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qlw_pci.c,v 1.5 2014/03/07 12:45:49 kettenis Exp $ */ +/* $OpenBSD: qlw_pci.c,v 1.6 2014/03/07 22:39:08 kettenis Exp $ */ /* * Copyright (c) 2011 David Gwynne <dlg@openbsd.org> @@ -251,6 +251,11 @@ qlw_pci_attach(struct device *parent, struct device *self, void *aux) while (node) { if (OF_getprop(node, "scsi-initiator-id", &initiator, sizeof(initiator)) == sizeof(initiator)) { + /* + * Override the SCSI initiator ID provided by + * the nvram. + */ + sc->sc_flags |= QLW_FLAG_INITIATOR; sc->sc_initiator[0] = sc->sc_initiator[1] = initiator; break; } |