From 025acb1dac80c4edef66f906453991e8e7de9402 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Wed, 5 Jun 2013 00:48:32 +0000
Subject: [PATCH] conditionalize the net traversal code on FAST_IPSEC to make
 rump build.

---
 sys/netinet/udp_usrreq.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 147ab5becbd2..1b0539f58bda 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp_usrreq.c,v 1.188 2013/06/04 22:47:37 christos Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.189 2013/06/05 00:48:32 christos 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.188 2013/06/04 22:47:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.189 2013/06/05 00:48:32 christos Exp $");
 
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
@@ -148,8 +148,10 @@ struct	inpcbtable udbtable;
 percpu_t *udpstat_percpu;
 
 #ifdef INET
+#ifdef FAST_IPSEC
 static int udp4_espinudp (struct mbuf **, int, struct sockaddr *,
 	struct socket *);
+#endif
 static void udp4_sendup (struct mbuf *, int, struct sockaddr *,
 	struct socket *);
 static int udp4_realinput (struct sockaddr_in *, struct sockaddr_in *,
@@ -810,6 +812,7 @@ udp4_realinput(struct sockaddr_in *src, struct sockaddr_in *dst,
 				return rcvcnt;
 		}
 
+#ifdef FAST_IPSEC
 		/* Handle ESP over UDP */
 		if (inp->inp_flags & INP_ESPINUDP_ALL) {
 			struct sockaddr *sa = (struct sockaddr *)src;
@@ -835,6 +838,7 @@ udp4_realinput(struct sockaddr_in *src, struct sockaddr_in *dst,
 				break;
 			}
 		}
+#endif
 
 		/*
 		 * Check the minimum TTL for socket.
@@ -1439,7 +1443,7 @@ udp_statinc(u_int stat)
 	UDP_STATINC(stat);
 }
 
-#if defined(INET)
+#if defined(INET) && defined(FAST_IPSEC)
 /*
  * Returns:
  * 1 if the packet was processed