[src/trunk]: src/sys/netinet6 Fix error on kernels with options IPSEC without...

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

details:   https://anonhg.NetBSD.org/src/rev/dc2d58795123
branches:  trunk
changeset: 746855:dc2d58795123
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Fri Aug 21 16:52:43 2009 +0000

description:
Fix error on kernels with options IPSEC without options IPSEC_ESP.
Found on building evbppc/conf/PMPPC.

diffstat:

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

diffs (33 lines):

diff -r 59ea74d8a19f -r dc2d58795123 sys/netinet6/in6_proto.c
--- a/sys/netinet6/in6_proto.c  Fri Aug 21 15:18:57 2009 +0000
+++ b/sys/netinet6/in6_proto.c  Fri Aug 21 16:52:43 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_proto.c,v 1.84 2009/03/23 18:43:20 liamjfoy Exp $  */
+/*     $NetBSD: in6_proto.c,v 1.85 2009/08/21 16:52:43 tsutsui Exp $   */
 /*     $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $      */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.84 2009/03/23 18:43:20 liamjfoy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.85 2009/08/21 16:52:43 tsutsui Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -178,9 +178,13 @@
 
 #if defined(IPSEC) || defined(FAST_IPSEC)
 PR_WRAP_CTLINPUT(ah6_ctlinput)
+
+#define        ah6_ctlinput    ah6_ctlinput_wrapper
+#endif
+
+#if (defined(IPSEC) && defined(IPSEC_ESP)) || defined(FAST_IPSEC)
 PR_WRAP_CTLINPUT(esp6_ctlinput)
 
-#define        ah6_ctlinput    ah6_ctlinput_wrapper
 #define        esp6_ctlinput   esp6_ctlinput_wrapper
 #endif