From owner-p4-projects@FreeBSD.ORG  Thu Dec 18 06:46:34 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CC4C51065678; Thu, 18 Dec 2008 06:46:34 +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 8520F1065670
	for <perforce@FreeBSD.org>; Thu, 18 Dec 2008 06:46:34 +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 7E8728FC13
	for <perforce@FreeBSD.org>; Thu, 18 Dec 2008 06:46:34 +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 mBI6kYKi062511
	for <perforce@FreeBSD.org>; Thu, 18 Dec 2008 06:46:34 GMT
	(envelope-from rfrench@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBI6kYlb062509
	for perforce@freebsd.org; Thu, 18 Dec 2008 06:46:34 GMT
	(envelope-from rfrench@FreeBSD.org)
Date: Thu, 18 Dec 2008 06:46:34 GMT
Message-Id: <200812180646.mBI6kYlb062509@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 154915 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: Thu, 18 Dec 2008 06:46:35 -0000

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

Change 154915 by rfrench@rfrench_mpls2 on 2008/12/18 06:45:50

	No Changes just tidying up an open client as per the nag lis

Affected files ...

.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#15 edit

Differences ...

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

@@ -58,10 +58,23 @@
 void
 create_fake_entry(struct sockaddr_mpls *smpls)
 {
-	if (MPLS_LABEL_GET(smpls->smpls_in_label) == 44) {
+>>>> ORIGINAL //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#12
+	if (MPLS_LABEL_GET(smpls->smpls_in_label) == 66) {
+		smpls->smpls_operation = 3;
+==== THEIRS //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#13
 		smpls->smpls_operation = 3;
+==== YOURS //rfrench_mpls2/netmpls/mpls_input.c
+	if (MPLS_LABEL_GET(smpls->smpls_in_label) == 100) {
+		smpls->smpls_operation = 2;
+<<<<
 		smpls->smpls_out_exp = 14;
+>>>> ORIGINAL //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#12
+		smpls->smpls_out_label = MPLS_LABEL_SET(1000);
+==== THEIRS //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#13
 		smpls->smpls_out_label = MPLS_LABEL_SET(100);
+==== YOURS //rfrench_mpls2/netmpls/mpls_input.c
+		smpls->smpls_out_label = MPLS_LABEL_SET(0);
+<<<<
 		smpls->smpls_out_ifindex = smpls->smpls_in_ifindex;
 	}
 }