From owner-p4-projects@FreeBSD.ORG  Thu Jul  5 16:23:00 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 E088116A46E; Thu,  5 Jul 2007 16:22:59 +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 B34B716A46C
	for <perforce@FreeBSD.org>; Thu,  5 Jul 2007 16:22:59 +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 A366C13C447
	for <perforce@FreeBSD.org>; Thu,  5 Jul 2007 16:22:59 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l65GMxji089882
	for <perforce@FreeBSD.org>; Thu, 5 Jul 2007 16:22:59 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l65GMxus089879
	for perforce@freebsd.org; Thu, 5 Jul 2007 16:22:59 GMT
	(envelope-from zec@FreeBSD.org)
Date: Thu, 5 Jul 2007 16:22:59 GMT
Message-Id: <200707051622.l65GMxus089879@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 122964 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: Thu, 05 Jul 2007 16:23:00 -0000

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

Change 122964 by zec@zec_tpx32 on 2007/07/05 16:22:22

	Protosw population fix.

Affected files ...

.. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#3 edit

Differences ...

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

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/netipsec/xform_ipip.c,v 1.13 2006/06/26 22:30:08 thompsa Exp $	*/
+/*	$FreeBSD: src/sys/netipsec/xform_ipip.c,v 1.14 2007/07/03 12:13:45 gnn Exp $	*/
 /*	$OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -614,7 +614,7 @@
 	return (error);
 }
 
-#ifdef FAST_IPSEC
+#ifdef IPSEC
 static int
 ipe4_init(struct secasvar *sav, struct xformsw *xsp)
 {
@@ -646,21 +646,25 @@
 
 extern struct domain inetdomain;
 static struct protosw ipe4_protosw =
-{ SOCK_RAW,	&inetdomain,	IPPROTO_IPV4,	PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-  ip4_input,
-		0, 		0,		rip_ctloutput,
-  0,
-  0,		0,		0,		0,
-  &rip_usrreqs
+{
+	.pr_type = 		SOCK_RAW,
+	.pr_domain =		&inetdomain,
+	.pr_protocol = 		IPPROTO_IPV4,
+	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
+	.pr_input =		ip4_input,
+	.pr_ctloutput = 	rip_ctloutput,
+	.pr_usrreqs = 		&rip_usrreqs
 };
 #ifdef INET6
 static struct ip6protosw ipe6_protosw =
-{ SOCK_RAW,	&inetdomain,	IPPROTO_IPV6,	PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-  ip4_input6,
-		0,	 	0,		rip_ctloutput,
-  0,
-  0,		0,		0,		0,
-  &rip_usrreqs
+{
+	.pr_type = 		SOCK_RAW,
+	.pr_domain = 		&inetdomain,
+	.pr_protocol =		IPPROTO_IPV6,
+	.pr_flags = 		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
+	.pr_input =		ip4_input6,
+	.pr_ctloutput =		rip_ctloutput,
+	.pr_usrreqs =		&rip_usrreqs
 };
 #endif
 
@@ -693,4 +697,4 @@
 #endif
 }
 SYSINIT(ipe4_xform_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE, ipe4_attach, NULL);
-#endif	/* FAST_IPSEC */
+#endif	/* IPSEC */