From owner-p4-projects@FreeBSD.ORG  Tue May 18 12:40:00 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 665211065675; Tue, 18 May 2010 12:40:00 +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 2A8A7106566C
	for <perforce@FreeBSD.org>; Tue, 18 May 2010 12:40:00 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 17E958FC0A
	for <perforce@FreeBSD.org>; Tue, 18 May 2010 12:40:00 +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 o4ICdxln022851
	for <perforce@FreeBSD.org>; Tue, 18 May 2010 12:39:59 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4ICdxRr022849
	for perforce@freebsd.org; Tue, 18 May 2010 12:39:59 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Tue, 18 May 2010 12:39:59 GMT
Message-Id: <201005181239.o4ICdxRr022849@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec <anchie@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 178441 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: Tue, 18 May 2010 12:40:00 -0000

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

Change 178441 by anchie@anchie_malimis on 2010/05/18 12:39:09

	Resolving conflicts occured while doing IFC.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_var.h#10 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#32 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_var.h#10 (text+ko) ====

@@ -199,12 +199,7 @@
 #endif
 #define	V_ip_rsvpd		VNET(ip_rsvpd)
 #define	V_ip_mrouter		VNET(ip_mrouter)
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/netinet/ip_var.h#62
 
-extern u_char	ip_protox[];
-extern int	(*legal_vif_num)(int);
-extern u_long	(*ip_mcast_src)(int);
-extern struct	pr_usrreqs rip_usrreqs;
 #define	V_rsvp_on		VNET(rsvp_on)
 #define	V_send_so		VNET(send_so)
 

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#32 (text+ko) ====

@@ -1773,7 +1773,7 @@
 	int error = -1;
 	int flags = 0;
 	int ip6len;
-	int  skip;
+	int  skip = 0;
 	unsigned short *nd_type;
 
 	ip6 = mtod(m, struct ip6_hdr *);