From owner-p4-projects@FreeBSD.ORG  Thu Nov  2 01:48:49 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3A1E516A580; Thu,  2 Nov 2006 01:48:49 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E781E16A5A8
	for <perforce@freebsd.org>; Thu,  2 Nov 2006 01:48:48 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B650943D60
	for <perforce@freebsd.org>; Thu,  2 Nov 2006 01:48:48 +0000 (GMT)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA21mmQc010994
	for <perforce@freebsd.org>; Thu, 2 Nov 2006 01:48:48 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA21mmU6010991
	for perforce@freebsd.org; Thu, 2 Nov 2006 01:48:48 GMT
	(envelope-from mjacob@freebsd.org)
Date: Thu, 2 Nov 2006 01:48:48 GMT
Message-Id: <200611020148.kA21mmU6010991@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 108995 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Nov 2006 01:48:49 -0000

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;