From owner-svn-src-projects@FreeBSD.ORG  Mon Sep  7 19:01:35 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 16053106566B;
	Mon,  7 Sep 2009 19:01:35 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0554B8FC1E;
	Mon,  7 Sep 2009 19:01:35 +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 n87J1YLP023805;
	Mon, 7 Sep 2009 19:01:34 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n87J1Yn7023803;
	Mon, 7 Sep 2009 19:01:34 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200909071901.n87J1Yn7023803@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 7 Sep 2009 19:01:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196945 - projects/ppc64/sys/boot/common
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Sep 2009 19:01:35 -0000

Author: nwhitehorn
Date: Mon Sep  7 19:01:34 2009
New Revision: 196945
URL: http://svn.freebsd.org/changeset/base/196945

Log:
  r60506 broke netbooting on PowerPC/OFW completely. We need a way of
  reverting this in a way that doesn't break Book-E.

Modified:
  projects/ppc64/sys/boot/common/dev_net.c

Modified: projects/ppc64/sys/boot/common/dev_net.c
==============================================================================
--- projects/ppc64/sys/boot/common/dev_net.c	Mon Sep  7 18:54:55 2009	(r196944)
+++ projects/ppc64/sys/boot/common/dev_net.c	Mon Sep  7 19:01:34 2009	(r196945)
@@ -145,7 +145,7 @@ net_open(struct open_file *f, ...)
 				return (error);
 			}
 		}
-#if defined(__sparc64__)
+#if defined(__sparc64__) || defined(__powerpc__)
 		netdev_opens++;
 #endif
 	}