Module Name: src
Committed By: ozaki-r
Date: Fri Mar 27 07:47:11 UTC 2015
Modified Files:
src/sys/netipsec: xform_ipip.c
Log Message:
Remove unnecessary ifdef IPSEC
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/netipsec/xform_ipip.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/netipsec/xform_ipip.c
diff -u src/sys/netipsec/xform_ipip.c:1.31 src/sys/netipsec/xform_ipip.c:1.32
--- src/sys/netipsec/xform_ipip.c:1.31 Thu Jun 5 23:48:17 2014
+++ src/sys/netipsec/xform_ipip.c Fri Mar 27 07:47:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_ipip.c,v 1.31 2014/06/05 23:48:17 rmind Exp $ */
+/* $NetBSD: xform_ipip.c,v 1.32 2015/03/27 07:47:10 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_ipip.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.31 2014/06/05 23:48:17 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.32 2015/03/27 07:47:10 ozaki-r Exp $");
/*
* IP-inside-IP processing
@@ -646,7 +646,6 @@ bad:
return (error);
}
-#ifdef IPSEC
static int
ipe4_init(struct secasvar *sav, const struct xformsw *xsp)
{
@@ -725,8 +724,6 @@ static struct ip6protosw ipe4_protosw6 =
};
#endif
-#endif /* IPSEC */
-
/*
* Check the encapsulated packet to see if we want it
*/
