PERFORCE change 154915 for review

[Ryan French]

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

Change 154915 by rfrench at 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;
 	}
 }