Module Name: src
Committed By: tsutsui
Date: Fri Aug 21 16:52:43 UTC 2009
Modified Files:
src/sys/netinet6: in6_proto.c
Log Message:
Fix error on kernels with options IPSEC without options IPSEC_ESP.
Found on building evbppc/conf/PMPPC.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/netinet6/in6_proto.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/in6_proto.c
diff -u src/sys/netinet6/in6_proto.c:1.84 src/sys/netinet6/in6_proto.c:1.85
--- src/sys/netinet6/in6_proto.c:1.84 Mon Mar 23 18:43:20 2009
+++ src/sys/netinet6/in6_proto.c Fri Aug 21 16:52:43 2009
@@ -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)
-PR_WRAP_CTLINPUT(esp6_ctlinput)
#define ah6_ctlinput ah6_ctlinput_wrapper
+#endif
+
+#if (defined(IPSEC) && defined(IPSEC_ESP)) || defined(FAST_IPSEC)
+PR_WRAP_CTLINPUT(esp6_ctlinput)
+
#define esp6_ctlinput esp6_ctlinput_wrapper
#endif
