aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2006-06-19 23:55:09 +0000
committerNicolas Thill <nico@openwrt.org>2006-06-19 23:55:09 +0000
commit8fb7a067f6c393b74c4a8f3e6f59d343a4b3251f (patch)
treed12a3e3318d8449ff3968e7e35a7665ec64ff0c3
parent861303d954fa93db06244152070789f60e20e47f (diff)
downloadupstream-8fb7a067f6c393b74c4a8f3e6f59d343a4b3251f.tar.gz
upstream-8fb7a067f6c393b74c4a8f3e6f59d343a4b3251f.tar.bz2
upstream-8fb7a067f6c393b74c4a8f3e6f59d343a4b3251f.zip
fix MODULE_PARM removal in 2.6.17.
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4016 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/openswan/patches/102-new_module_param.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/package/openswan/patches/102-new_module_param.patch b/package/openswan/patches/102-new_module_param.patch
new file mode 100644
index 0000000000..1e133e61fb
--- /dev/null
+++ b/package/openswan/patches/102-new_module_param.patch
@@ -0,0 +1,37 @@
+diff -ruN openswan-2.4.5-old/linux/net/ipsec/aes/ipsec_alg_aes.c openswan-2.4.5-new/linux/net/ipsec/aes/ipsec_alg_aes.c
+--- openswan-2.4.5-old/linux/net/ipsec/aes/ipsec_alg_aes.c 2005-05-20 18:48:55.000000000 +0200
++++ openswan-2.4.5-new/linux/net/ipsec/aes/ipsec_alg_aes.c 2006-06-20 00:17:57.000000000 +0200
+@@ -59,12 +59,20 @@
+ static int keymaxbits=0;
+ #if defined(CONFIG_KLIPS_ENC_AES_MODULE)
+ MODULE_AUTHOR("JuanJo Ciarlante <jjo-ipsec@mendoza.gov.ar>");
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
++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);
++#else
+ MODULE_PARM(debug_aes, "i");
+ MODULE_PARM(test_aes, "i");
+ MODULE_PARM(excl_aes, "i");
+ MODULE_PARM(keyminbits, "i");
+ MODULE_PARM(keymaxbits, "i");
+ #endif
++#endif
+
+ #if CONFIG_KLIPS_ENC_AES_MAC
+ #include "crypto/aes_xcbc_mac.h"
+@@ -79,8 +87,12 @@
+ #else
+ static int auth_id=9;
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
++module_param(auth_id, int, 0);
++#else
+ MODULE_PARM(auth_id, "i");
+ #endif
++#endif
+
+ #define ESP_AES 12 /* truely _constant_ :) */
+