From owner-p4-projects@FreeBSD.ORG  Mon Sep  8 20:49:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8AE331065679; Mon,  8 Sep 2008 20:49:50 +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 4E9491065675
	for <perforce@FreeBSD.org>; Mon,  8 Sep 2008 20:49:50 +0000 (UTC)
	(envelope-from rfrench@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4096C8FC1A
	for <perforce@FreeBSD.org>; Mon,  8 Sep 2008 20:49:50 +0000 (UTC)
	(envelope-from rfrench@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m88Knoa3078478
	for <perforce@FreeBSD.org>; Mon, 8 Sep 2008 20:49:50 GMT
	(envelope-from rfrench@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88KnoGR078476
	for perforce@freebsd.org; Mon, 8 Sep 2008 20:49:50 GMT
	(envelope-from rfrench@FreeBSD.org)
Date: Mon, 8 Sep 2008 20:49:50 GMT
Message-Id: <200809082049.m88KnoGR078476@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rfrench@FreeBSD.org using -f
From: Ryan French <rfrench@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 149444 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: Mon, 08 Sep 2008 20:49:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=149444

Change 149444 by rfrench@rfrench_mpls on 2008/09/08 20:49:01

	Stil trying to work through why my code isnt being called when the if_ethersubr.c demuxer is run.

Affected files ...

.. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#7 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#5 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#5 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#5 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#5 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_shim.c#3 edit

Differences ...

==== //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#7 (text+ko) ====


==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#5 (text+ko) ====

@@ -40,9 +40,6 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 
-#define MPLS
-#define MPLS_DEBUG
-
 /*
  * Structure of a SHIM header.
  */

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#5 (text+ko) ====

@@ -15,6 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "opt_mpls.h"
+
 #include <sys/param.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#5 (text+ko) ====

@@ -28,6 +28,8 @@
  * SUCH DAMAGE.
  */
  
+#include "opt_mpls.h"
+ 
 #include <sys/cdefs.h>
 
 #include <sys/param.h>
@@ -48,9 +50,6 @@
  * MPLS protocol family:
  */
 
-#define MPLS
-#define MPLS_DEBUG
-
 extern struct domain mplsdomain;
 extern struct pr_usrreqs mpls_raw_usrreq;
 

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#5 (text+ko) ====

@@ -28,7 +28,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE.
  */
-
+ 
+#include "opt_mpls.h"
+ 
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_shim.c#3 (text+ko) ====

@@ -28,6 +28,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE.
  */
+ 
+#include "opt_mpls.h"
 
 #include <sys/param.h>
 #include <sys/malloc.h>