svn commit: r284808 - head/sys/dev/isp

[Alexander Motin]

Author: mav
Date: Thu Jun 25 10:03:38 2015
New Revision: 284808
URL: https://svnweb.freebsd.org/changeset/base/284808

Log:
  Remove limitations on setting WWNNs starting from 2.
  
  It is odd that driver first tries to generate synthetic WWNN based on
  WWPN starting from 2, but then refuses to use it.  If we don't trust
  generated WWNN, we should probably not generate it.  Same time this
  limitation prevents potentially valid WWNN setting by user.

Modified:
  head/sys/dev/isp/isp.c

Modified: head/sys/dev/isp/isp.c
==============================================================================
--- head/sys/dev/isp/isp.c	Thu Jun 25 08:22:25 2015	(r284807)
+++ head/sys/dev/isp/isp.c	Thu Jun 25 10:03:38 2015	(r284808)
@@ -1848,7 +1848,7 @@ isp_fibre_init(ispsoftc_t *isp)
 		icbp->icb_lunetimeout = ICB_LUN_ENABLE_TOV;
 	}
 #endif
-	if (fcp->isp_wwnn && fcp->isp_wwpn && (fcp->isp_wwnn >> 60) != 2) {
+	if (fcp->isp_wwnn && fcp->isp_wwpn) {
 		icbp->icb_fwoptions |= ICBOPT_BOTH_WWNS;
 		MAKE_NODE_NAME_FROM_WWN(icbp->icb_nodename, fcp->isp_wwnn);
 		MAKE_NODE_NAME_FROM_WWN(icbp->icb_portname, fcp->isp_wwpn);
@@ -2075,7 +2075,7 @@ isp_fibre_init_2400(ispsoftc_t *isp)
 	}
 	icbp->icb_logintime = ICB_LOGIN_TOV;
 
-	if (fcp->isp_wwnn && fcp->isp_wwpn && (fcp->isp_wwnn >> 60) != 2) {
+	if (fcp->isp_wwnn && fcp->isp_wwpn) {
 		icbp->icb_fwoptions1 |= ICB2400_OPT1_BOTH_WWNS;
 		MAKE_NODE_NAME_FROM_WWN(icbp->icb_portname, fcp->isp_wwpn);
 		MAKE_NODE_NAME_FROM_WWN(icbp->icb_nodename, fcp->isp_wwnn);