[src/trunk]: src/sys/netinet conditionalize the net traversal code on FAST_IP...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/546b798e00a4
branches:  trunk
changeset: 787163:546b798e00a4
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jun 05 00:48:32 2013 +0000

description:
conditionalize the net traversal code on FAST_IPSEC to make rump build.

diffstat:

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

diffs (54 lines):

diff -r 61c4e3231b71 -r 546b798e00a4 sys/netinet/udp_usrreq.c
--- a/sys/netinet/udp_usrreq.c  Wed Jun 05 00:01:16 2013 +0000
+++ b/sys/netinet/udp_usrreq.c  Wed Jun 05 00:48:32 2013 +0000
@@ -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 @@
 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 @@
                                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 @@
                                break;
                        }
                }
+#endif
 
                /*
                 * Check the minimum TTL for socket.
@@ -1439,7 +1443,7 @@
        UDP_STATINC(stat);
 }
 
-#if defined(INET)
+#if defined(INET) && defined(FAST_IPSEC)
 /*
  * Returns:
  * 1 if the packet was processed