From ffe8bc5e2d502fc2d027ef4e53b5e9904ae747df Mon Sep 17 00:00:00 2001 From: mav Date: Sun, 28 Jun 2015 09:27:34 +0000 Subject: [PATCH] MFC r284808: 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. --- sys/dev/isp/isp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index 5a18958bb1d2..a3471437c2c3 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -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);