net/openswan/patches/140-generated_autoconf.patch

   1 --- a/linux/include/ocf-compat.h
   2 +++ b/linux/include/ocf-compat.h
   3 @@ -35,10 +35,11 @@
   4  /****************************************************************************/
   5  #ifdef __KERNEL__
   6  #include <linux/version.h>
   7 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
   8 -#include <linux/config.h>
   9 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
  10 +#include <generated/autoconf.h>
  11 +#else
  12 +#include <linux/autoconf.h>
  13  #endif
  14 -
  15  /*
  16   * fake some BSD driver interface stuff specifically for OCF use
  17   */
  18 --- a/linux/include/openswan/ipsec_kversion.h
  19 +++ b/linux/include/openswan/ipsec_kversion.h
  20 @@ -43,10 +43,11 @@
  21   * We use a lot of config defines,  on older kernels that means we
  22   * need to include config.h
  23   */
  24 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
  25 -#include <linux/config.h>
  26 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
  27 +#include <generated/autoconf.h>
  28 +#else
  29 +#include <linux/autoconf.h>
  30  #endif
  31 -
  32  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
  33  /* Only enable IPv6 support on newer kernels with IPv6 enabled */
  34  # if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
  35 --- a/linux/net/ipsec/aes/ipsec_alg_aes.c
  36 +++ b/linux/net/ipsec/aes/ipsec_alg_aes.c
  37 @@ -22,8 +22,10 @@
  38   *
  39   */
  40  #include <linux/version.h>
  41 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
  42 -#include <linux/config.h>
  43 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
  44 +#include <generated/autoconf.h>
  45 +#else
  46 +#include <linux/autoconf.h>
  47  #endif
  48  #include <linux/version.h>
  49
  50 --- a/linux/net/ipsec/des/ipsec_alg_3des.c
  51 +++ b/linux/net/ipsec/des/ipsec_alg_3des.c
  52 @@ -19,8 +19,10 @@
  53   *
  54   */
  55  #include <linux/version.h>
  56 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
  57 -#include <linux/config.h>
  58 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
  59 +#include <generated/autoconf.h>
  60 +#else
  61 +#include <linux/autoconf.h>
  62  #endif
  63  #include <linux/version.h>
  64
  65 --- a/linux/net/ipsec/ipcomp.c
  66 +++ b/linux/net/ipsec/ipcomp.c
  67 @@ -19,10 +19,11 @@
  68  /* SSS */
  69
  70  #include <linux/version.h>
  71 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
  72 -#include <linux/config.h>
  73 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
  74 +#include <generated/autoconf.h>
  75 +#else
  76 +#include <linux/autoconf.h>
  77  #endif
  78 -
  79  #define __NO_VERSION__
  80  #include <linux/module.h>
  81  #include <linux/kernel.h> /* printk() */
  82 --- a/linux/net/ipsec/ipsec_ah.c
  83 +++ b/linux/net/ipsec/ipsec_ah.c
  84 @@ -14,10 +14,11 @@
  85   */
  86
  87  #include <linux/version.h>
  88 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
  89 -#include <linux/config.h>
  90 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
  91 +#include <generated/autoconf.h>
  92 +#else
  93 +#include <linux/autoconf.h>
  94  #endif
  95 -
  96  #define __NO_VERSION__
  97  #include <linux/module.h>
  98  #include <linux/kernel.h> /* printk() */
  99 --- a/linux/net/ipsec/ipsec_alg.c
 100 +++ b/linux/net/ipsec/ipsec_alg.c
 101 @@ -19,10 +19,11 @@
 102   *
 103   */
 104  #include <linux/version.h>
 105 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 106 -#include <linux/config.h>
 107 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 108 +#include <generated/autoconf.h>
 109 +#else
 110 +#include <linux/autoconf.h>
 111  #endif
 112 -
 113  #define __NO_VERSION__
 114  #include <linux/module.h>
 115  #include <linux/kernel.h> /* printk() */
 116 --- a/linux/net/ipsec/ipsec_alg_cryptoapi.c
 117 +++ b/linux/net/ipsec/ipsec_alg_cryptoapi.c
 118 @@ -28,10 +28,11 @@
 119   *   modprobe ipsec_cryptoapi des_ede3=0                 (everything but 3DES)
 120   */
 121  #include <linux/version.h>
 122 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 123 -#include <linux/config.h>
 124 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 125 +#include <generated/autoconf.h>
 126 +#else
 127 +#include <linux/autoconf.h>
 128  #endif
 129 -
 130  /*
 131   *     special case: ipsec core modular with this static algo inside:
 132   *     must avoid MODULE magic for this file
 133 --- a/linux/net/ipsec/ipsec_esp.c
 134 +++ b/linux/net/ipsec/ipsec_esp.c
 135 @@ -14,10 +14,11 @@
 136   */
 137
 138  #include <linux/version.h>
 139 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 140 -#include <linux/config.h>
 141 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 142 +#include <generated/autoconf.h>
 143 +#else
 144 +#include <linux/autoconf.h>
 145  #endif
 146 -
 147  #define __NO_VERSION__
 148  #include <linux/module.h>
 149  #include <linux/kernel.h> /* printk() */
 150 --- a/linux/net/ipsec/ipsec_init.c
 151 +++ b/linux/net/ipsec/ipsec_init.c
 152 @@ -19,8 +19,10 @@
 153   */
 154
 155  #include <linux/version.h>
 156 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 157 -#include <linux/config.h>
 158 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 159 +#include <generated/autoconf.h>
 160 +#else
 161 +#include <linux/autoconf.h>
 162  #endif
 163  #include <linux/module.h>
 164  #include <linux/kernel.h> /* printk() */
 165 --- a/linux/net/ipsec/ipsec_ipcomp.c
 166 +++ b/linux/net/ipsec/ipsec_ipcomp.c
 167 @@ -14,10 +14,11 @@
 168   */
 169
 170  #include <linux/version.h>
 171 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 172 -#include <linux/config.h>
 173 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 174 +#include <generated/autoconf.h>
 175 +#else
 176 +#include <linux/autoconf.h>
 177  #endif
 178 -
 179  #define __NO_VERSION__
 180  #include <linux/module.h>
 181  #include <linux/kernel.h> /* printk() */
 182 --- a/linux/net/ipsec/ipsec_ipip.c
 183 +++ b/linux/net/ipsec/ipsec_ipip.c
 184 @@ -14,10 +14,11 @@
 185   */
 186
 187  #include <linux/version.h>
 188 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 189 -#include <linux/config.h>
 190 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 191 +#include <generated/autoconf.h>
 192 +#else
 193 +#include <linux/autoconf.h>
 194  #endif
 195 -
 196  #define __NO_VERSION__
 197  #include <linux/module.h>
 198  #include <linux/kernel.h> /* printk() */
 199 --- a/linux/net/ipsec/ipsec_ocf.c
 200 +++ b/linux/net/ipsec/ipsec_ocf.c
 201 @@ -16,10 +16,11 @@
 202   */
 203
 204  #include <linux/version.h>
 205 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 206 -#include <linux/config.h>
 207 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 208 +#include <generated/autoconf.h>
 209 +#else
 210 +#include <linux/autoconf.h>
 211  #endif
 212 -
 213  #define __NO_VERSION__
 214  #include <linux/module.h>
 215  #include <linux/kernel.h> /* printk() */
 216 --- a/linux/net/ipsec/ipsec_ocf.h
 217 +++ b/linux/net/ipsec/ipsec_ocf.h
 218 @@ -19,8 +19,10 @@
 219   */
 220
 221  #include <linux/version.h>
 222 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 223 -#include <linux/config.h>
 224 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 225 +#include <generated/autoconf.h>
 226 +#else
 227 +#include <linux/autoconf.h>
 228  #endif
 229  #include <linux/kernel.h>
 230
 231 --- a/linux/net/ipsec/ipsec_radij.c
 232 +++ b/linux/net/ipsec/ipsec_radij.c
 233 @@ -16,8 +16,10 @@
 234   */
 235
 236  #include <linux/version.h>
 237 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 238 -#include <linux/config.h>
 239 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 240 +#include <generated/autoconf.h>
 241 +#else
 242 +#include <linux/autoconf.h>
 243  #endif
 244  #include <linux/kernel.h> /* printk() */
 245
 246 --- a/linux/net/ipsec/ipsec_rcv.c
 247 +++ b/linux/net/ipsec/ipsec_rcv.c
 248 @@ -21,10 +21,11 @@
 249   */
 250
 251  #include <linux/version.h>
 252 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 253 -#include <linux/config.h>
 254 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 255 +#include <generated/autoconf.h>
 256 +#else
 257 +#include <linux/autoconf.h>
 258  #endif
 259 -
 260  #define __NO_VERSION__
 261  #include <linux/module.h>
 262  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,26)
 263 --- a/linux/net/ipsec/ipsec_sa.c
 264 +++ b/linux/net/ipsec/ipsec_sa.c
 265 @@ -19,8 +19,10 @@
 266   */
 267
 268  #include <linux/version.h>
 269 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 270 -#include <linux/config.h>
 271 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 272 +#include <generated/autoconf.h>
 273 +#else
 274 +#include <linux/autoconf.h>
 275  #endif
 276  #include <linux/kernel.h> /* printk() */
 277
 278 --- a/linux/net/ipsec/ipsec_snprintf.c
 279 +++ b/linux/net/ipsec/ipsec_snprintf.c
 280 @@ -19,8 +19,10 @@
 281   */
 282
 283  #include <linux/version.h>
 284 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 285 -#include <linux/config.h>
 286 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 287 +#include <generated/autoconf.h>
 288 +#else
 289 +#include <linux/autoconf.h>
 290  #endif
 291  #define __NO_VERSION__
 292  #include <linux/module.h>
 293 --- a/linux/net/ipsec/ipsec_tunnel.c
 294 +++ b/linux/net/ipsec/ipsec_tunnel.c
 295 @@ -24,8 +24,10 @@
 296  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,26)
 297  # include <linux/moduleparam.h>
 298  #endif
 299 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 300 -#include <linux/config.h>
 301 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 302 +#include <generated/autoconf.h>
 303 +#else
 304 +#include <linux/autoconf.h>
 305  #endif
 306  #include <linux/kernel.h> /* printk() */
 307
 308 --- a/linux/net/ipsec/ipsec_xform.c
 309 +++ b/linux/net/ipsec/ipsec_xform.c
 310 @@ -17,8 +17,10 @@
 311   */
 312
 313  #include <linux/version.h>
 314 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 315 -#include <linux/config.h>
 316 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 317 +#include <generated/autoconf.h>
 318 +#else
 319 +#include <linux/autoconf.h>
 320  #endif
 321  #include <linux/kernel.h> /* printk() */
 322
 323 --- a/linux/net/ipsec/pfkey_v2_ext_process.c
 324 +++ b/linux/net/ipsec/pfkey_v2_ext_process.c
 325 @@ -20,8 +20,10 @@
 326   */
 327
 328  #include <linux/version.h>
 329 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 330 -#include <linux/config.h>
 331 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 332 +#include <generated/autoconf.h>
 333 +#else
 334 +#include <linux/autoconf.h>
 335  #endif
 336  #include <linux/kernel.h> /* printk() */
 337
 338 --- a/linux/net/ipsec/pfkey_v2_parser.c
 339 +++ b/linux/net/ipsec/pfkey_v2_parser.c
 340 @@ -23,8 +23,10 @@
 341
 342
 343  #include <linux/version.h>
 344 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 345 -#include <linux/config.h>
 346 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 347 +#include <generated/autoconf.h>
 348 +#else
 349 +#include <linux/autoconf.h>
 350  #endif
 351  #include <linux/kernel.h> /* printk() */
 352
 353 --- a/linux/net/ipsec/radij.c
 354 +++ b/linux/net/ipsec/radij.c
 355 @@ -54,8 +54,10 @@
 356   */
 357
 358  #include <linux/version.h>
 359 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 360 -#include <linux/config.h>
 361 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 362 +#include <generated/autoconf.h>
 363 +#else
 364 +#include <linux/autoconf.h>
 365  #endif
 366  #include <linux/kernel.h> /* printk() */
 367