diff options
| author | mjacob <mjacob@FreeBSD.org> | 2007-01-20 04:00:21 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2007-01-20 04:00:21 +0000 |
| commit | 31cdd06b7a65f1d446e539addc985286967ddbd7 (patch) | |
| tree | 792fae0deb725a4903b51a0a3ecacd02fad8422b /sys/dev/isp/isp_freebsd.h | |
| parent | 8ea92215ceca5ac7158c4e42c2cb6db4ba06072e (diff) | |
| download | FreeBSD-src-31cdd06b7a65f1d446e539addc985286967ddbd7.zip FreeBSD-src-31cdd06b7a65f1d446e539addc985286967ddbd7.tar.gz | |
MFP4: Move default setting to the end of isp_reset instead of the
front of isp_init so we can read NVRAM even if we're role ISP_NONE.
Prepare for reintroduction of channels (for FC) for N-Port
Virtualization.
Fix a botch in handle assignment that caused us to nuke one device
when a new one arrives and end up with two devices with the same
identity in the virtual target mapping table.
Diffstat (limited to 'sys/dev/isp/isp_freebsd.h')
| -rw-r--r-- | sys/dev/isp/isp_freebsd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index 26fd924..f49b1d8 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -346,8 +346,8 @@ default: \ #define DEFAULT_LOOPID(x) (isp)->isp_osinfo.default_id #define DEFAULT_NODEWWN(isp) (isp)->isp_osinfo.default_node_wwn #define DEFAULT_PORTWWN(isp) (isp)->isp_osinfo.default_port_wwn -#define ISP_NODEWWN(isp) FCPARAM(isp)->isp_nodewwn -#define ISP_PORTWWN(isp) FCPARAM(isp)->isp_portwwn +#define ISP_NODEWWN(isp) FCPARAM(isp)->isp_wwnn_nvram +#define ISP_PORTWWN(isp) FCPARAM(isp)->isp_wwpn_nvram #if BYTE_ORDER == BIG_ENDIAN #ifdef ISP_SBUS_SUPPORTED |
