From owner-svn-src-all@FreeBSD.ORG  Thu Aug 13 01:45:27 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0832E1065670;
	Thu, 13 Aug 2009 01:45:27 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E976B8FC44;
	Thu, 13 Aug 2009 01:45:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7D1jQ41082801;
	Thu, 13 Aug 2009 01:45:26 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7D1jQd7082799;
	Thu, 13 Aug 2009 01:45:26 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <200908130145.n7D1jQd7082799@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Thu, 13 Aug 2009 01:45:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196163 - stable/8/sys/dev/isp
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Aug 2009 01:45:27 -0000

Author: mjacob
Date: Thu Aug 13 01:45:26 2009
New Revision: 196163
URL: http://svn.freebsd.org/changeset/base/196163

Log:
  MFC 196162: Have at least a fallback WWN so cards on sun branded FC cards
  can configure.
  
  Approved by:	re

Modified:
  stable/8/sys/dev/isp/isp_freebsd.c

Modified: stable/8/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/8/sys/dev/isp/isp_freebsd.c	Thu Aug 13 01:17:26 2009	(r196162)
+++ stable/8/sys/dev/isp/isp_freebsd.c	Thu Aug 13 01:45:26 2009	(r196163)
@@ -5280,6 +5280,10 @@ isp_default_wwn(ispsoftc_t * isp, int ch
 			return (seed);
 		}
 		seed = iswwnn ? FCPARAM(isp, chan)->isp_wwnn_nvram : FCPARAM(isp, chan)->isp_wwpn_nvram;
+		if (seed) {
+			return (seed);
+		}
+		return (0x400000007F000009ull);
 	} else {
 		seed = iswwnn ? fc->def_wwnn : fc->def_wwpn;
 	}