From owner-p4-projects@FreeBSD.ORG  Tue Aug 11 19:42:05 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F2A551065672; Tue, 11 Aug 2009 19:42:04 +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 AA6561065670
	for <perforce@FreeBSD.org>; Tue, 11 Aug 2009 19:42:04 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 999C48FC41
	for <perforce@FreeBSD.org>; Tue, 11 Aug 2009 19:42:04 +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 n7BJg4JI068664
	for <perforce@FreeBSD.org>; Tue, 11 Aug 2009 19:42:04 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7BJg4Bf068662
	for perforce@freebsd.org; Tue, 11 Aug 2009 19:42:04 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Tue, 11 Aug 2009 19:42:04 GMT
Message-Id: <200908111942.n7BJg4Bf068662@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>
Cc: 
Subject: PERFORCE change 167222 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: Tue, 11 Aug 2009 19:42:06 -0000

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

Change 167222 by anchie@anchie_desnimis on 2009/08/11 19:41:58

		Minor fix. 	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#7 edit

Differences ...

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

@@ -73,13 +73,7 @@
 #include <netinet6/scope6_var.h>
 #include <netinet6/nd6.h>
 #include <netinet/icmp6.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/netinet6/nd6_nbr.c#54
-#include <netinet6/vinet6.h>
-==== THEIRS //depot/vendor/freebsd/src/sys/netinet6/nd6_nbr.c#60
-==== YOURS //anchie_desnimis/gsoc2009-send/src/sys/netinet6/nd6_nbr.c
 #include <netinet6/send.h>
-#include <netinet6/vinet6.h>
-<<<<
 
 #ifdef DEV_CARP
 #include <netinet/ip_carp.h>