diff -urN openswan-2.4.5/linux/net/ipsec/aes/ipsec_alg_aes.c openswan-2.4.5SL/linux/net/ipsec/aes/ipsec_alg_aes.c --- openswan-2.4.5/linux/net/ipsec/aes/ipsec_alg_aes.c 2005-05-20 19:48:55.000000000 +0300 +++ openswan-2.4.5SL/linux/net/ipsec/aes/ipsec_alg_aes.c 2006-06-18 20:34:07.000000000 +0300 @@ -28,7 +28,8 @@ * special case: ipsec core modular with this static algo inside: * must avoid MODULE magic for this file */ -#if CONFIG_KLIPS_MODULE && CONFIG_KLIPS_ENC_AES +#if defined(CONFIG_KLIPS_MODULE) && defined(CONFIG_KLIPS_MODULE) \ + && CONFIG_KLIPS_ENC_AES && CONFIG_KLIPS_ENC_AES #undef MODULE #endif @@ -59,11 +60,19 @@ static int keymaxbits=0; #if defined(CONFIG_KLIPS_ENC_AES_MODULE) MODULE_AUTHOR("JuanJo Ciarlante "); +#ifdef MODULE_PARM MODULE_PARM(debug_aes, "i"); MODULE_PARM(test_aes, "i"); MODULE_PARM(excl_aes, "i"); MODULE_PARM(keyminbits, "i"); MODULE_PARM(keymaxbits, "i"); +#else +module_param (debug_aes, int, 0); +module_param (test_aes, int, 0); +module_param (excl_aes, int, 0); +module_param (keyminbits, int, 0); +module_param (keymaxbits, int, 0); +#endif #endif #if CONFIG_KLIPS_ENC_AES_MAC @@ -79,7 +88,11 @@ #else static int auth_id=9; #endif +#ifdef MODULE_PARM MODULE_PARM(auth_id, "i"); +#else +module_param(auth_id, int, 0); +#endif #endif #define ESP_AES 12 /* truely _constant_ :) */ @@ -250,7 +263,7 @@ MODULE_LICENSE("GPL"); #endif -#if 0+NOT_YET +#if defined(NOT_YET) && 0+NOT_YET #ifndef MODULE /* * This is intended for static module setups, currently