--- a/linux/include/ocf-compat.h +++ b/linux/include/ocf-compat.h @@ -35,10 +35,11 @@ /****************************************************************************/ #ifdef __KERNEL__ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif - /* * fake some BSD driver interface stuff specifically for OCF use */ --- a/linux/include/openswan/ipsec_kversion.h +++ b/linux/include/openswan/ipsec_kversion.h @@ -43,10 +43,11 @@ * We use a lot of config defines, on older kernels that means we * need to include config.h */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) /* Only enable IPv6 support on newer kernels with IPv6 enabled */ # if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) --- a/linux/net/ipsec/aes/ipsec_alg_aes.c +++ b/linux/net/ipsec/aes/ipsec_alg_aes.c @@ -22,8 +22,10 @@ * */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include --- a/linux/net/ipsec/des/ipsec_alg_3des.c +++ b/linux/net/ipsec/des/ipsec_alg_3des.c @@ -19,8 +19,10 @@ * */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include --- a/linux/net/ipsec/ipcomp.c +++ b/linux/net/ipsec/ipcomp.c @@ -19,10 +19,11 @@ /* SSS */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif - #define __NO_VERSION__ #include #include /* printk() */ --- a/linux/net/ipsec/ipsec_ah.c +++ b/linux/net/ipsec/ipsec_ah.c @@ -14,10 +14,11 @@ */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif - #define __NO_VERSION__ #include #include /* printk() */ --- a/linux/net/ipsec/ipsec_alg.c +++ b/linux/net/ipsec/ipsec_alg.c @@ -19,10 +19,11 @@ * */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif - #define __NO_VERSION__ #include #include /* printk() */ --- a/linux/net/ipsec/ipsec_alg_cryptoapi.c +++ b/linux/net/ipsec/ipsec_alg_cryptoapi.c @@ -26,10 +26,11 @@ * modprobe ipsec_cryptoapi des_ede3=0 (everything but 3DES) */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif - /* * special case: ipsec core modular with this static algo inside: * must avoid MODULE magic for this file --- a/linux/net/ipsec/ipsec_esp.c +++ b/linux/net/ipsec/ipsec_esp.c @@ -14,10 +14,11 @@ */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif - #define __NO_VERSION__ #include #include /* printk() */ --- a/linux/net/ipsec/ipsec_init.c +++ b/linux/net/ipsec/ipsec_init.c @@ -19,8 +19,10 @@ */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include #include /* printk() */ --- a/linux/net/ipsec/ipsec_ipcomp.c +++ b/linux/net/ipsec/ipsec_ipcomp.c @@ -14,10 +14,11 @@ */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif - #define __NO_VERSION__ #include #include /* printk() */ --- a/linux/net/ipsec/ipsec_ipip.c +++ b/linux/net/ipsec/ipsec_ipip.c @@ -14,10 +14,11 @@ */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif - #define __NO_VERSION__ #include #include /* printk() */ --- a/linux/net/ipsec/ipsec_ocf.c +++ b/linux/net/ipsec/ipsec_ocf.c @@ -16,10 +16,11 @@ */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif - #define __NO_VERSION__ #include #include /* printk() */ --- a/linux/net/ipsec/ipsec_ocf.h +++ b/linux/net/ipsec/ipsec_ocf.h @@ -19,8 +19,10 @@ */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include --- a/linux/net/ipsec/ipsec_radij.c +++ b/linux/net/ipsec/ipsec_radij.c @@ -16,8 +16,10 @@ */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include /* printk() */ --- a/linux/net/ipsec/ipsec_rcv.c +++ b/linux/net/ipsec/ipsec_rcv.c @@ -21,10 +21,11 @@ */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif - #define __NO_VERSION__ #include #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,26) --- a/linux/net/ipsec/ipsec_sa.c +++ b/linux/net/ipsec/ipsec_sa.c @@ -19,8 +19,10 @@ */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include /* printk() */ --- a/linux/net/ipsec/ipsec_snprintf.c +++ b/linux/net/ipsec/ipsec_snprintf.c @@ -19,8 +19,10 @@ */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #define __NO_VERSION__ #include --- a/linux/net/ipsec/ipsec_tunnel.c +++ b/linux/net/ipsec/ipsec_tunnel.c @@ -24,8 +24,10 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,26) # include #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include /* printk() */ --- a/linux/net/ipsec/ipsec_xform.c +++ b/linux/net/ipsec/ipsec_xform.c @@ -17,8 +17,10 @@ */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include /* printk() */ --- a/linux/net/ipsec/pfkey_v2_ext_process.c +++ b/linux/net/ipsec/pfkey_v2_ext_process.c @@ -20,8 +20,10 @@ */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include /* printk() */ --- a/linux/net/ipsec/pfkey_v2_parser.c +++ b/linux/net/ipsec/pfkey_v2_parser.c @@ -23,8 +23,10 @@ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include /* printk() */ --- a/linux/net/ipsec/radij.c +++ b/linux/net/ipsec/radij.c @@ -54,8 +54,10 @@ */ #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) -#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#include +#else +#include #endif #include /* printk() */