diff options
| author | Matt Jacob <mjacob@FreeBSD.org> | 2009-12-31 04:16:18 +0000 |
|---|---|---|
| committer | Matt Jacob <mjacob@FreeBSD.org> | 2009-12-31 04:16:18 +0000 |
| commit | 1d52a1ad426d2aed4777ac1da09bc62e3fbe1c9e (patch) | |
| tree | 02353848eba8e4093eb45e2274bb9943ec800795 /sys/dev/isp | |
| parent | 15768c780ab653f9abe64d098fc2edb303080ad3 (diff) | |
| download | src-1d52a1ad426d2aed4777ac1da09bc62e3fbe1c9e.tar.gz src-1d52a1ad426d2aed4777ac1da09bc62e3fbe1c9e.zip | |
Create a Node WWN from the *Port* WWN, not vice versa, for 2400s.
If the NAA is type 2, the Node WWN is the Port WWN with the 12 bits
of port (48..60) cleared. This iff a wwn fetched from NVRAM is zero.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=201325
Diffstat (limited to 'sys/dev/isp')
| -rw-r--r-- | sys/dev/isp/isp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index d13e208b1825..918d9551b0cb 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -8350,11 +8350,6 @@ isp_parse_nvram_2400(ispsoftc_t *isp, uint8_t *nvram_data) ISP2400_NVRAM_FIRMWARE_OPTIONS3(nvram_data)); wwn = ISP2400_NVRAM_PORT_NAME(nvram_data); - if (wwn) { - if ((wwn >> 60) != 2 && (wwn >> 60) != 5) { - wwn = 0; - } - } fcp->isp_wwpn_nvram = wwn; wwn = ISP2400_NVRAM_NODE_NAME(nvram_data); @@ -8363,6 +8358,10 @@ isp_parse_nvram_2400(ispsoftc_t *isp, uint8_t *nvram_data) wwn = 0; } } + if (wwn == 0 && (fcp->isp_wwpn_nvram >> 60) == 2) { + wwn = fcp->isp_wwpn_nvram; + wwn &= ~((uint64_t) 0xfff << 48); + } fcp->isp_wwnn_nvram = wwn; if (ISP2400_NVRAM_EXCHANGE_COUNT(nvram_data)) { |