From owner-p4-projects@FreeBSD.ORG  Wed Aug 18 21:27:25 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9679F10656A6; Wed, 18 Aug 2010 21:27:25 +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 59127106567A
	for <perforce@FreeBSD.org>; Wed, 18 Aug 2010 21:27:25 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 474118FC14
	for <perforce@FreeBSD.org>; Wed, 18 Aug 2010 21:27:25 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7ILRPoO098371
	for <perforce@FreeBSD.org>; Wed, 18 Aug 2010 21:27:25 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7ILRPpo098368
	for perforce@freebsd.org; Wed, 18 Aug 2010 21:27:25 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Wed, 18 Aug 2010 21:27:25 GMT
Message-Id: <201008182127.o7ILRPpo098368@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.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 182583 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: Wed, 18 Aug 2010 21:27:25 -0000

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

Change 182583 by anchie@anchie_malimis on 2010/08/18 21:26:25

		Fixing the p4 integration issue.	

Affected files ...

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

Differences ...

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

@@ -71,11 +71,10 @@
 #include <netinet6/ip6_var.h>
 #include <netinet6/scope6_var.h>
 #include <netinet6/nd6.h>
+#include <netinet/ip_carp.h>
 #include <netinet/icmp6.h>
 #include <netinet6/send.h>
 
-#ifdef DEV_CARP
-
 #define SDL(s) ((struct sockaddr_dl *)s)
 
 struct dadq;