diff options
| author | gnn <gnn@FreeBSD.org> | 2007-07-03 12:13:45 +0000 |
|---|---|---|
| committer | gnn <gnn@FreeBSD.org> | 2007-07-03 12:13:45 +0000 |
| commit | aeca69ded51d6233029432f2819670cdedc399fa (patch) | |
| tree | 33a53f093fb66f940c2ed2dd7aab6c80eeaeafce /sys/netinet6/ip6_input.c | |
| parent | d5177fc84ed40844713b6dc0352469ffbb12e526 (diff) | |
| download | FreeBSD-src-aeca69ded51d6233029432f2819670cdedc399fa.zip FreeBSD-src-aeca69ded51d6233029432f2819670cdedc399fa.tar.gz | |
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
Diffstat (limited to 'sys/netinet6/ip6_input.c')
| -rw-r--r-- | sys/netinet6/ip6_input.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 96e7850..65818cc 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -101,11 +101,11 @@ #include <netinet6/in6_ifattach.h> #include <netinet6/nd6.h> -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netipsec/ipsec.h> #include <netinet6/ip6_ipsec.h> #include <netipsec/ipsec6.h> -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ #include <netinet6/ip6protosw.h> @@ -224,7 +224,7 @@ ip6_input(m) GIANT_REQUIRED; /* XXX for now */ -#ifdef FAST_IPSEC +#ifdef IPSEC /* * should the inner packet be considered authentic? * see comment in ah4_input(). @@ -234,7 +234,7 @@ ip6_input(m) m->m_flags &= ~M_AUTHIPHDR; m->m_flags &= ~M_AUTHIPDGM; -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ /* * make sure we don't have onion peering information into m_tag. @@ -761,7 +761,7 @@ passin: goto bad; } -#ifdef FAST_IPSEC +#ifdef IPSEC /* * enforce IPsec policy checking if we are seeing last header. * note that we do not visit this with protocols with pcb layer @@ -769,7 +769,7 @@ passin: */ if (ip6_ipsec_input(m, nxt)) goto bad; -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ nxt = (*inet6sw[ip6_protox[nxt]].pr_input)(&m, &off, nxt); } return; |
