MFC r275123: Fix incorrect check, blocking MULTIID functionality.
MFC r275124:  Fix WWNN/WWPN generation for virtual channels.