diff options
| author | mjacob <mjacob@FreeBSD.org> | 2000-10-12 23:59:40 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2000-10-12 23:59:40 +0000 |
| commit | 11ad16e614a5b689815149fca0f3e94d1d34f95d (patch) | |
| tree | 51cecdfe20859992006a681c37a867431974ef3c | |
| parent | b9fbfa05c7fb61abe4da9f701ed83d0db329a01d (diff) | |
| download | FreeBSD-src-11ad16e614a5b689815149fca0f3e94d1d34f95d.zip FreeBSD-src-11ad16e614a5b689815149fca0f3e94d1d34f95d.tar.gz | |
Make changes required by change in how default and usable node and port
WWNS are made and used.
| -rw-r--r-- | sys/dev/isp/isp_freebsd.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index 3d83b52..fb1f9d4 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -228,9 +228,9 @@ struct isposinfo { #define DEFAULT_IID(x) 7 #define DEFAULT_LOOPID(x) 109 #define DEFAULT_NODEWWN(isp) (isp)->isp_osinfo.default_wwn -#define DEFAULT_PORTWWN(isp) \ - isp_port_from_node_wwn((isp), (isp)->isp_osinfo.default_wwn) -#define PORT_FROM_NODE_WWN isp_port_from_node_wwn +#define DEFAULT_PORTWWN(isp) (isp)->isp_osinfo.default_wwn +#define ISP_NODEWWN(isp) FCPARAM(isp)->isp_nodewwn +#define ISP_PORTWWN(isp) FCPARAM(isp)->isp_portwwn #define ISP_UNSWIZZLE_AND_COPY_PDBP(isp, dest, src) \ if((void *)src != (void *)dest) bcopy(src, dest, sizeof (isp_pdb_t)) @@ -400,18 +400,6 @@ strncat(char *d, const char *s, size_t c) return (t); } -static INLINE u_int64_t isp_port_from_node_wwn(struct ispsoftc *, u_int64_t); -static INLINE u_int64_t -isp_port_from_node_wwn(struct ispsoftc *isp, u_int64_t node_wwn) -{ - u_int64_t rv = node_wwn; - if ((node_wwn >> 60) == 2) { - rv = node_wwn | - (((u_int64_t)(isp->isp_unit+1)) << 48); - } - return (rv); -} - /* * Common inline functions */ |
