Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.183.6.1
retrieving revision 1.183.6.2
diff -u -p -r1.183.6.1 -r1.183.6.2
--- src/sys/netinet/udp_usrreq.c	2012/02/18 07:35:41	1.183.6.1
+++ src/sys/netinet/udp_usrreq.c	2012/04/05 21:33:44	1.183.6.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp_usrreq.c,v 1.183.6.1 2012/02/18 07:35:41 mrg Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.183.6.2 2012/04/05 21:33:44 mrg Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.183.6.1 2012/02/18 07:35:41 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.183.6.2 2012/04/05 21:33:44 mrg Exp $");
 
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
@@ -129,13 +129,6 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c
 #endif
 #endif	/* FAST_IPSEC */
 
-#ifdef KAME_IPSEC
-#include <netinet6/ipsec.h>
-#include <netinet6/ipsec_private.h>
-#include <netinet6/esp.h>
-#include <netkey/key.h>
-#endif /* KAME_IPSEC */
-
 #ifdef COMPAT_50
 #include <compat/sys/socket.h>
 #endif
@@ -634,7 +627,7 @@ udp4_sendup(struct mbuf *m, int off /* o
 		return;
 	}
 
-#if defined(KAME_IPSEC) || defined(FAST_IPSEC)
+#if defined(FAST_IPSEC)
 	/* check AH/ESP integrity. */
 	if (so != NULL && ipsec4_in_reject_so(m, so)) {
 		IPSEC_STATINC(IPSEC_STAT_IN_POLVIO);
@@ -684,7 +677,7 @@ udp6_sendup(struct mbuf *m, int off /* o
 		return;
 	in6p = sotoin6pcb(so);
 
-#if defined(KAME_IPSEC) || defined(FAST_IPSEC)
+#if defined(FAST_IPSEC)
 	/* check AH/ESP integrity. */
 	if (so != NULL && ipsec6_in_reject_so(m, so)) {
 		IPSEC6_STATINC(IPSEC_STAT_IN_POLVIO);