From 0cd74db89b7c7ca5bface8b05ae8263c0a54217b Mon Sep 17 00:00:00 2001
From: gnn <gnn@FreeBSD.org>
Date: Sun, 1 Jul 2007 11:41:27 +0000
Subject: 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
---
 sys/netinet/udp_usrreq.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'sys/netinet/udp_usrreq.c')

diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 04a4434..ae03b54 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -82,10 +82,6 @@
 #include <netipsec/ipsec.h>
 #endif
 
-#ifdef IPSEC
-#include <netinet6/ipsec.h>
-#endif
-
 #include <machine/in_cksum.h>
 
 #include <security/mac/mac_framework.h>
@@ -499,16 +495,14 @@ udp_append(struct inpcb *inp, struct ip *ip, struct mbuf *n, int off,
 
 	INP_LOCK_ASSERT(inp);
 
-#if defined(IPSEC) || defined(FAST_IPSEC)
+#ifdef FAST_IPSEC
 	/* check AH/ESP integrity. */
 	if (ipsec4_in_reject(n, inp)) {
-#ifdef IPSEC
-		ipsecstat.in_polvio++;
-#endif
+		ipsec4stat.in_polvio++;
 		m_freem(n);
 		return;
 	}
-#endif /*IPSEC || FAST_IPSEC*/
+#endif /* FAST_IPSEC */
 #ifdef MAC
 	if (mac_check_inpcb_deliver(inp, n) != 0) {
 		m_freem(n);
-- 
cgit v1.1