Author: mav
Date: Wed Nov 26 16:05:01 2014
New Revision: 275124
URL: https://svnweb.freebsd.org/changeset/base/275124
Log:
Fix WWNN/WWPN generation for virtual channels.
MFC after: 1 week
Modified:
head/sys/dev/isp/isp_freebsd.c
Modified: head/sys/dev/isp/isp_freebsd.c
==============================================================================
--- head/sys/dev/isp/isp_freebsd.c Wed Nov 26 15:03:21 2014
(r275123)
+++ head/sys/dev/isp/isp_freebsd.c Wed Nov 26 16:05:01 2014
(r275124)
@@ -6138,10 +6138,9 @@ isp_default_wwn(ispsoftc_t * isp, int ch
return (seed);
}
return (0x400000007F000009ull);
- } else {
- seed = iswwnn ? fc->def_wwnn : fc->def_wwpn;
}
+ seed = iswwnn ? fc->def_wwnn : fc->def_wwpn;
/*
* For channel zero just return what we have. For either ACTIVE or
@@ -6164,11 +6163,9 @@ isp_default_wwn(ispsoftc_t * isp, int ch
if (seed) {
return (seed);
}
- if (isactive) {
+ seed = iswwnn ? ISP_FC_PC(isp, 0)->def_wwnn : ISP_FC_PC(isp,
0)->def_wwpn;
+ if (seed == 0)
seed = iswwnn ? FCPARAM(isp, 0)->isp_wwnn_nvram : FCPARAM(isp,
0)->isp_wwpn_nvram;
- } else {
- seed = iswwnn ? ISP_FC_PC(isp, 0)->def_wwnn : ISP_FC_PC(isp,
0)->def_wwpn;
- }
if (((seed >> 60) & 0xf) == 2) {
/*
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
