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/raw_ip6.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/raw_ip6.c')
| -rw-r--r-- | sys/netinet6/raw_ip6.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 3b29375..20c4b36 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -95,10 +95,10 @@ #include <netinet6/raw_ip6.h> #include <netinet6/scope6_var.h> -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netipsec/ipsec.h> #include <netipsec/ipsec6.h> -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ #include <machine/stdarg.h> @@ -181,7 +181,7 @@ docontinue: if (last) { struct mbuf *n = m_copy(m, 0, (int)M_COPYALL); -#ifdef FAST_IPSEC +#ifdef IPSEC /* * Check AH/ESP integrity. */ @@ -190,7 +190,7 @@ docontinue: ipsec6stat.in_polvio++; /* do not inject data into pcb */ } else -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ if (n) { if (last->in6p_flags & IN6P_CONTROLOPTS || last->in6p_socket->so_options & SO_TIMESTAMP) @@ -212,7 +212,7 @@ docontinue: } last = in6p; } -#ifdef FAST_IPSEC +#ifdef IPSEC /* * Check AH/ESP integrity. */ @@ -223,7 +223,7 @@ docontinue: /* do not inject data into pcb */ INP_UNLOCK(last); } else -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ if (last) { if (last->in6p_flags & IN6P_CONTROLOPTS || last->in6p_socket->so_options & SO_TIMESTAMP) |
