d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix WWNN/WWPN generation for virtual channels.

Browse Source 
MFC after:	1 week
This commit is contained in:
mav 2014-11-26 16:05:01 +00:00
parent 469e2dc867
commit 579087806c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/isp/isp_freebsd.c
View File

@ -6138,10 +6138,9 @@ isp_default_wwn(ispsoftc_t * isp, int chan, int isactive, int iswwnn)
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 chan, int isactive, int iswwnn)
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) {
/*