diff options
author | gnn <gnn@FreeBSD.org> | 2007-07-01 11:41:27 +0000 |
---|---|---|
committer | gnn <gnn@FreeBSD.org> | 2007-07-01 11:41:27 +0000 |
commit | 0cd74db89b7c7ca5bface8b05ae8263c0a54217b (patch) | |
tree | 2bcfb09751e29be8d172ae9e835bab3e5c5699f2 /sys/netinet/tcp_input.c | |
parent | 384e40af76655727c82190f4d5dc6c857583206e (diff) | |
download | FreeBSD-src-0cd74db89b7c7ca5bface8b05ae8263c0a54217b.zip FreeBSD-src-0cd74db89b7c7ca5bface8b05ae8263c0a54217b.tar.gz |
Commit IPv6 support for FAST_IPSEC to the tree.
This commit includes only the kernel files, the rest of the files
will follow in a second commit.
Reviewed by: bz
Approved by: re
Supported by: Secure Computing
Diffstat (limited to 'sys/netinet/tcp_input.c')
-rw-r--r-- | sys/netinet/tcp_input.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 82e36db..9d31c79 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -87,12 +87,6 @@ #include <netipsec/ipsec6.h> #endif /*FAST_IPSEC*/ -#ifdef IPSEC -#include <netinet6/ipsec.h> -#include <netinet6/ipsec6.h> -#include <netkey/key.h> -#endif /*IPSEC*/ - #include <machine/in_cksum.h> #include <security/mac/mac_framework.h> @@ -451,22 +445,18 @@ findpcb: m->m_pkthdr.rcvif); } -#if defined(IPSEC) || defined(FAST_IPSEC) +#ifdef FAST_IPSEC #ifdef INET6 if (isipv6 && inp != NULL && ipsec6_in_reject(m, inp)) { -#ifdef IPSEC ipsec6stat.in_polvio++; -#endif goto dropunlock; } else #endif /* INET6 */ if (inp != NULL && ipsec4_in_reject(m, inp)) { -#ifdef IPSEC - ipsecstat.in_polvio++; -#endif + ipsec4stat.in_polvio++; goto dropunlock; } -#endif /*IPSEC || FAST_IPSEC*/ +#endif /* FAST_IPSEC */ /* * If the INPCB does not exist then all data in the incoming |