From owner-p4-projects@FreeBSD.ORG  Mon Jun 14 21:22:03 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2F8A01065675; Mon, 14 Jun 2010 21:22:03 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E6F0E1065672
	for <perforce@FreeBSD.org>; Mon, 14 Jun 2010 21:22:02 +0000 (UTC)
	(envelope-from afiveg@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D4A0B8FC12
	for <perforce@FreeBSD.org>; Mon, 14 Jun 2010 21:22:02 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5ELM2XS088502
	for <perforce@FreeBSD.org>; Mon, 14 Jun 2010 21:22:02 GMT
	(envelope-from afiveg@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5ELM24m088500
	for perforce@freebsd.org; Mon, 14 Jun 2010 21:22:02 GMT
	(envelope-from afiveg@FreeBSD.org)
Date: Mon, 14 Jun 2010 21:22:02 GMT
Message-Id: <201006142122.o5ELM24m088500@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	afiveg@FreeBSD.org using -f
From: Alexandre Fiveg <afiveg@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 179622 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 14 Jun 2010 21:22:03 -0000

http://p4web.freebsd.org/@@179622?ac=10

Change 179622 by afiveg@cottonmouth on 2010/06/14 21:21:47

	continue port to em

Affected files ...

.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_em.c#5 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_igb.c#4 edit
.. //depot/projects/soc2010/ringmap/current/sys/modules/em/Makefile#8 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#4 edit

Differences ...

==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_em.c#5 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_igb.c#4 (text+ko) ====

@@ -272,8 +272,8 @@
 
 static devclass_t igb_devclass;
 DRIVER_MODULE(igb, pci, igb_driver, igb_devclass, 0, 0);
-MODULE_DEPEND(igb, pci, 1, 1, 1);
-MODULE_DEPEND(igb, ether, 1, 1, 1);
+MODULE_DEPEND(igb, pci, 0, 1, 100);
+MODULE_DEPEND(igb, ether, 0, 1, 100);
 
 /*********************************************************************
  *  Tunable default values.

==== //depot/projects/soc2010/ringmap/current/sys/modules/em/Makefile#8 (text+ko) ====

@@ -1,5 +1,10 @@
 # $FreeBSD: src/sys/modules/em/Makefile,v 1.16 2010/03/29 23:36:34 jfv Exp $
+.if defined(KERNEL_RINGMAP)
+.PATH:  ${.CURDIR}/../../dev/e1000 : ${.CURDIR}/../../net
+.else
 .PATH:  ${.CURDIR}/../../dev/e1000
+.endif
+
 KMOD    = if_em
 SRCS    = device_if.h bus_if.h pci_if.h opt_inet.h
 SRCS    += $(CORE_SRC) $(LEGACY_SRC)

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#4 (text+ko) ====