Date: Thu, 2 Nov 2006 01:48:48 GMT From: Matt Jacob <mjacob@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 108995 for review Message-ID: <200611020148.kA21mmU6010991@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=108995 Change 108995 by mjacob@newisp on 2006/11/02 01:47:58 Allow for just using a WWPN for 24XX cards. Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#25 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#25 (text+ko) ==== @@ -1725,9 +1725,16 @@ ((uint32_t) (nwwn & 0xffffffff)), ((uint32_t) (pwwn >> 32)), ((uint32_t) (pwwn & 0xffffffff))); + } else if (pwwn) { + icbp->icb_fwoptions &= ~ICBOPT_BOTH_WWNS; + MAKE_NODE_NAME_FROM_WWN(icbp->icb_portname, pwwn); + isp_prt(isp, ISP_LOGDEBUG1, + "Setting ICB Port 0x%08x%08x", + ((uint32_t) (pwwn >> 32)), + ((uint32_t) (pwwn & 0xffffffff))); } else { - isp_prt(isp, ISP_LOGDEBUG1, "Not using any WWNs"); - icbp->icb_fwoptions &= ~(ICBOPT_BOTH_WWNS|ICBOPT_FULL_LOGIN); + isp_prt(isp, ISP_LOGERR, "No valid WWNs to use"); + return; } icbp->icb_rqstqlen = RQUEST_QUEUE_LEN(isp); if (icbp->icb_rqstqlen < 1) { @@ -1945,9 +1952,8 @@ ((uint32_t) (pwwn >> 32)), ((uint32_t) (pwwn & 0xffffffff))); } else { - isp_prt(isp, ISP_LOGDEBUG1, "Not using any WWNs"); - icbp->icb_fwoptions1 &= - ~(ICB2400_OPT1_BOTH_WWNS|ICB2400_OPT1_FULL_LOGIN); + isp_prt(isp, ISP_LOGERR, "No valid WWNs to use"); + return; } icbp->icb_retry_count = fcp->isp_retry_count;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611020148.kA21mmU6010991>