From owner-svn-src-all@FreeBSD.ORG  Mon May 10 18:46:38 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 26FC11065677;
	Mon, 10 May 2010 18:46:38 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 159F18FC13;
	Mon, 10 May 2010 18:46:38 +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 o4AIkbT6035936;
	Mon, 10 May 2010 18:46:37 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4AIkbfb035927;
	Mon, 10 May 2010 18:46:37 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201005101846.o4AIkbfb035927@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 10 May 2010 18:46:37 +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: r207861 - stable/8/sys/dev/bge
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: Mon, 10 May 2010 18:46:38 -0000

Author: marius
Date: Mon May 10 18:46:37 2010
New Revision: 207861
URL: http://svn.freebsd.org/changeset/base/207861

Log:
  MFC: r207242
  
  For the on-board interfaces found in Fujitsu SPARC64 machines obtain the
  MAC address via OFW as well.

Modified:
  stable/8/sys/dev/bge/if_bge.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/dev/bge/if_bge.c
==============================================================================
--- stable/8/sys/dev/bge/if_bge.c	Mon May 10 18:45:20 2010	(r207860)
+++ stable/8/sys/dev/bge/if_bge.c	Mon May 10 18:46:37 2010	(r207861)
@@ -520,7 +520,7 @@ bge_has_eaddr(struct bge_softc *sc)
 	 */
 	if (OF_getprop(ofw_bus_get_node(dev), SPARC64_OFW_SUBVENDOR,
 	    &subvendor, sizeof(subvendor)) == sizeof(subvendor) &&
-	    subvendor == SUN_VENDORID)
+	    (subvendor == FJTSU_VENDORID || subvendor == SUN_VENDORID))
 		return (0);
 	memset(buf, 0, sizeof(buf));
 	if (OF_package_to_path(ofw_bus_get_node(dev), buf, sizeof(buf)) > 0) {