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
retrieving revision 1.145.2.2
retrieving revision 1.146
diff -u -p -r1.145.2.2 -r1.146
--- src/sys/netinet/udp_usrreq.c	2006/03/01 09:28:47	1.145.2.2
+++ src/sys/netinet/udp_usrreq.c	2006/01/21 00:15:36	1.146
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp_usrreq.c,v 1.145.2.2 2006/03/01 09:28:47 yamt Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.146 2006/01/21 00:15:36 rpaulo 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.145.2.2 2006/03/01 09:28:47 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.146 2006/01/21 00:15:36 rpaulo Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -95,6 +95,11 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 
+#ifdef IPSEC_NAT_T
+#include <netinet6/ipsec.h>
+#include <netinet6/esp.h>
+#endif
+
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
@@ -119,7 +124,6 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c
 #ifdef FAST_IPSEC
 #include <netipsec/ipsec.h>
 #include <netipsec/ipsec_var.h>			/* XXX ipsecstat namespace */
-#include <netipsec/esp.h>
 #ifdef INET6
 #include <netipsec/ipsec6.h>
 #endif
@@ -127,7 +131,6 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c
 
 #ifdef IPSEC
 #include <netinet6/ipsec.h>
-#include <netinet6/esp.h>
 #include <netkey/key.h>
 #endif /*IPSEC*/
 
@@ -1546,11 +1549,7 @@ udp4_espinudp(mp, off, src, so)
 	((u_int16_t *)(tag + 1))[1] = dport;
 	m_tag_prepend(n, tag);
 
-#ifdef FAST_IPSEC
-	ipsec4_common_input(n, iphdrlen);
-#else
 	esp4_input(n, iphdrlen);
-#endif
 
 	/* We handled it, it shoudln't be handled by UDP */
 	return 1;