From aeca69ded51d6233029432f2819670cdedc399fa Mon Sep 17 00:00:00 2001
From: gnn <gnn@FreeBSD.org>
Date: Tue, 3 Jul 2007 12:13:45 +0000
Subject: Commit the change from FAST_IPSEC to IPSEC.  The FAST_IPSEC option is
 now deprecated, as well as the KAME IPsec code. What was FAST_IPSEC is now
 IPSEC.

Approved by: re
Sponsored by: Secure Computing
---
 sys/netinet6/in6_proto.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sys/netinet6/in6_proto.c')

diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index df20857..08c46bc 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -115,10 +115,10 @@
 #include <netinet6/sctp6_var.h>
 #endif /* SCTP */
 
-#ifdef FAST_IPSEC
+#ifdef IPSEC
 #include <netipsec/ipsec.h>
 #include <netipsec/ipsec6.h>
-#endif /* FAST_IPSEC */
+#endif /* IPSEC */
 
 #include <netinet6/ip6protosw.h>
 
@@ -252,7 +252,7 @@ struct ip6protosw inet6sw[] = {
 	.pr_input =		frag6_input,
 	.pr_usrreqs =		&nousrreqs
 },
-#ifdef FAST_IPSEC
+#ifdef IPSEC
 {
 	.pr_type =		SOCK_RAW,
 	.pr_domain =		&inet6domain,
@@ -278,7 +278,7 @@ struct ip6protosw inet6sw[] = {
         .pr_input =		ipsec6_common_input,
 	.pr_usrreqs =		&nousrreqs,
 },
-#endif /* FAST_IPSEC */
+#endif /* IPSEC */
 #ifdef INET
 {
 	.pr_type =		SOCK_RAW,
@@ -438,9 +438,9 @@ SYSCTL_NODE(_net_inet6,	IPPROTO_TCP,	tcp6,	CTLFLAG_RW, 0,	"TCP6");
 #ifdef SCTP
 SYSCTL_NODE(_net_inet6,	IPPROTO_SCTP,	sctp6,	CTLFLAG_RW, 0,	"SCTP6");
 #endif
-#ifdef FAST_IPSEC
+#ifdef IPSEC
 SYSCTL_NODE(_net_inet6,	IPPROTO_ESP,	ipsec6,	CTLFLAG_RW, 0,	"IPSEC6");
-#endif /* FAST_IPSEC */
+#endif /* IPSEC */
 
 /* net.inet6.ip6 */
 static int
-- 
cgit v1.1