svn commit: r275444 - stable/10/sys/dev/isp

[Alexander Motin]

Author: mav
Date: Wed Dec  3 07:05:17 2014
New Revision: 275444
URL: https://svnweb.freebsd.org/changeset/base/275444

Log:
  MFC r275124:  Fix WWNN/WWPN generation for virtual channels.

Modified:
  stable/10/sys/dev/isp/isp_freebsd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/10/sys/dev/isp/isp_freebsd.c	Wed Dec  3 07:04:28 2014	(r275443)
+++ stable/10/sys/dev/isp/isp_freebsd.c	Wed Dec  3 07:05:17 2014	(r275444)
@@ -6109,10 +6109,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
@@ -6135,11 +6134,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) {
 		/*