PERFORCE change 122964 for review

[Marko Zec]

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

Change 122964 by zec at 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 at 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 */