diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-06-01 15:49:26 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-06-01 15:49:26 +0000 |
| commit | e36e9b532a339d0c6ec3ad4de0ce9f8b080d240c (patch) | |
| tree | 39fa2dd6d7f107d6d9571f55bdda5557d86b012e /sys/dev/ic | |
| parent | ea2b13562c5d2ee5ccf734f7ce9336d4bf9a5bd1 (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/dev/ic')
| -rw-r--r-- | sys/dev/ic/isp_openbsd.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/ic/isp_openbsd.h b/sys/dev/ic/isp_openbsd.h index f08f1a95968..719f1ca600c 100644 --- a/sys/dev/ic/isp_openbsd.h +++ b/sys/dev/ic/isp_openbsd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isp_openbsd.h,v 1.27 2008/01/21 20:00:33 sobrado Exp $ */ +/* $OpenBSD: isp_openbsd.h,v 1.28 2008/06/01 15:49:25 kettenis Exp $ */ /* * OpenBSD Specific definitions for the QLogic ISP Host Adapter */ @@ -89,6 +89,7 @@ struct isposinfo { rtpend : 1, no_mbox_ints : 1, blocked : 2; + int _iid; union { u_int64_t _wwn; u_int16_t _discovered[2]; @@ -246,7 +247,7 @@ default: \ #define XS_SET_STATE_STAT(a, b, c) -#define DEFAULT_IID(x) 7 +#define DEFAULT_IID(isp) (isp)->isp_osinfo._iid #define DEFAULT_LOOPID(x) 107 #define DEFAULT_NODEWWN(isp) (isp)->isp_osinfo.un._wwn #define DEFAULT_PORTWWN(isp) (isp)->isp_osinfo.un._wwn |