[src/trunk]: src/sys/netinet ipflow (IP fast forwarding) is not compatible wi...

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

details:   https://anonhg.NetBSD.org/src/rev/1bdd0c74d8bf
branches:  trunk
changeset: 555908:1bdd0c74d8bf
user:      scw <scw%NetBSD.org@localhost>
date:      Thu Dec 04 10:02:35 2003 +0000

description:
ipflow (IP fast forwarding) is not compatible with FAST_IPSEC either.

XXX: The decision whether or not to fast forward should be made
XXX: dynamically. Using the current approach seriously reduces
XXX: routing performance on gateways with IPsec enabled.

diffstat:

 sys/netinet/ip_input.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r ca1e69e85ade -r 1bdd0c74d8bf sys/netinet/ip_input.c
--- a/sys/netinet/ip_input.c    Thu Dec 04 09:59:07 2003 +0000
+++ b/sys/netinet/ip_input.c    Thu Dec 04 10:02:35 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_input.c,v 1.187 2003/11/26 21:15:47 itojun Exp $    */
+/*     $NetBSD: ip_input.c,v 1.188 2003/12/04 10:02:35 scw Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.187 2003/11/26 21:15:47 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.188 2003/12/04 10:02:35 scw Exp $");
 
 #include "opt_inet.h"
 #include "opt_gateway.h"
@@ -561,7 +561,7 @@
                        m_adj(m, len - m->m_pkthdr.len);
        }
 
-#ifdef IPSEC
+#if defined(IPSEC) || defined(FAST_IPSEC)
        /* ipflow (IP fast forwarding) is not compatible with IPsec. */
        m->m_flags &= ~M_CANFASTFWD;
 #else