From owner-p4-projects@FreeBSD.ORG  Sun Jul 15 22:58:58 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3B1E216A406; Sun, 15 Jul 2007 22:58:58 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EE88D16A400
	for <perforce@FreeBSD.org>; Sun, 15 Jul 2007 22:58:57 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id DF90013C4B5
	for <perforce@FreeBSD.org>; Sun, 15 Jul 2007 22:58:57 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6FMwvQP066881
	for <perforce@FreeBSD.org>; Sun, 15 Jul 2007 22:58:57 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FMwvTq066878
	for perforce@freebsd.org; Sun, 15 Jul 2007 22:58:57 GMT
	(envelope-from zec@FreeBSD.org)
Date: Sun, 15 Jul 2007 22:58:57 GMT
Message-Id: <200707152258.l6FMwvTq066878@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 123554 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: Sun, 15 Jul 2007 22:58:58 -0000

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

Change 123554 by zec@zec_tpx32 on 2007/07/15 22:58:09

	A fix to allow for a nooptions VIMAGE + options IPSEC kernel
	to be compiled.

Affected files ...

.. //depot/projects/vimage/src/sys/netipsec/ipsec.c#7 edit
.. //depot/projects/vimage/src/sys/netipsec/keysock.c#5 edit

Differences ...

==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#7 (text+ko) ====

@@ -2037,8 +2037,10 @@
 
 	V_ip4_esp_randpad = -1;
 	V_crypto_support = CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE;
+#ifdef REGRESSION
 	V_ipsec_replay = 0;
 	V_ipsec_integrity = 0;
+#endif
 
 	return 0;
 }

==== //depot/projects/vimage/src/sys/netipsec/keysock.c#5 (text+ko) ====

@@ -56,6 +56,7 @@
 #include <net/route.h>
 #include <net/vnet.h>
 
+#include <netinet/in.h>
 #include <netinet/vinet.h>
 
 #include <net/pfkeyv2.h>