From 0553edbd7795b5ae33c6044f6836fd0f10b64eef Mon Sep 17 00:00:00 2001 From: Bart Trojanowski Date: Fri, 28 Jul 2006 21:53:24 -0400 Subject: [PATCH] Convert all MODULE_PARM to module_param maintaining compatibility. This changeset supports MODULE_PARM api, but uses it only if module_param is not present. --- linux/net/ipsec/aes/ipsec_alg_aes.c | 16 +++++++++++++++- linux/net/ipsec/alg/ipsec_alg_cryptoapi.c | 23 +++++++++++++++++++++-- linux/net/ipsec/des/ipsec_alg_3des.c | 6 ++++++ linux/net/ipsec/ipsec_alg_cryptoapi.c | 22 ++++++++++++++++++++-- 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/linux/net/ipsec/aes/ipsec_alg_aes.c b/linux/net/ipsec/aes/ipsec_alg_aes.c index 6fe071f..c03a64e 100644 --- a/linux/net/ipsec/aes/ipsec_alg_aes.c +++ b/linux/net/ipsec/aes/ipsec_alg_aes.c @@ -59,12 +59,20 @@ static int keyminbits=0; static int keymaxbits=0; #if defined(CONFIG_KLIPS_ENC_AES_MODULE) MODULE_AUTHOR("JuanJo Ciarlante "); +#ifdef module_param +module_param(debug_aes,int,0664); +module_param(test_aes,int,0664); +module_param(excl_aes,int,0664); +module_param(keyminbits,int,0664); +module_param(keymaxbits,int,0664); +#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,7 +87,13 @@ static int auth_id=0; #else static int auth_id=9; #endif -/* MODULE_PARM(auth_id, "i"); */ +#if 0 +#ifdef MODULE_PARM +MODULE_PARM(auth_id, "i"); +#else +module_param(auth_id,int,0664); +#endif +#endif #endif #define ESP_AES 12 /* truely _constant_ :) */ diff --git a/linux/net/ipsec/alg/ipsec_alg_cryptoapi.c b/linux/net/ipsec/alg/ipsec_alg_cryptoapi.c index f6e1c2e..82419dd 100644 --- a/linux/net/ipsec/alg/ipsec_alg_cryptoapi.c +++ b/linux/net/ipsec/alg/ipsec_alg_cryptoapi.c @@ -99,14 +99,24 @@ #define DIGESTNAME_SHA1 "sha1" MODULE_AUTHOR("Juanjo Ciarlante, Harpo MAxx, Luciano Ruete"); static int debug=0; -MODULE_PARM(debug, "i"); static int test=0; -MODULE_PARM(test, "i"); static int excl=0; +#ifdef module_param +module_param(debug, int, 0664); +module_param(test, int, 0664); +module_param(excl, int, 0664); +#else +MODULE_PARM(debug, "i"); +MODULE_PARM(test, "i"); MODULE_PARM(excl, "i"); +#endif static int noauto = 0; +#ifdef module_param +module_param(noauto,int, 0664); +#else MODULE_PARM(noauto,"i"); +#endif MODULE_PARM_DESC(noauto, "Dont try all known algos, just setup enabled ones"); static int des_ede3[] = {-1, -1}; @@ -116,12 +126,21 @@ static int cast[] = {-1, -1}; static int serpent[] = {-1, -1}; static int twofish[] = {-1, -1}; +#ifdef module_param_array +module_param_array(des_ede3,int,NULL,0); +module_param_array(aes,int,NULL,0); +module_param_array(blowfish,int,NULL,0); +module_param_array(cast,int,NULL,0); +module_param_array(serpent,int,NULL,0); +module_param_array(twofish,int,NULL,0); +#else MODULE_PARM(des_ede3,"1-2i"); MODULE_PARM(aes,"1-2i"); MODULE_PARM(blowfish,"1-2i"); MODULE_PARM(cast,"1-2i"); MODULE_PARM(serpent,"1-2i"); MODULE_PARM(twofish,"1-2i"); +#endif MODULE_PARM_DESC(des_ede3, "0: disable | 1: force_enable | min,max: dontuse"); MODULE_PARM_DESC(aes, "0: disable | 1: force_enable | min,max: keybitlens"); MODULE_PARM_DESC(blowfish, "0: disable | 1: force_enable | min,max: keybitlens"); diff --git a/linux/net/ipsec/des/ipsec_alg_3des.c b/linux/net/ipsec/des/ipsec_alg_3des.c index c7aa807..0108855 100644 --- a/linux/net/ipsec/des/ipsec_alg_3des.c +++ b/linux/net/ipsec/des/ipsec_alg_3des.c @@ -50,10 +50,16 @@ static int excl_3des=0; #if defined(CONFIG_KLIPS_ENC_3DES_MODULE) MODULE_AUTHOR("Michael Richardson "); +#ifdef module_param +module_param(debug_3des, int, 0664); +module_param(test_des, int, 0664); +module_param(excl_des, int, 0664); +#else MODULE_PARM(debug_3des, "i"); MODULE_PARM(test_des, "i"); MODULE_PARM(excl_des, "i"); #endif +#endif #define ESP_AES_MAC_KEY_SZ 16 /* 128 bit MAC key */ #define ESP_AES_MAC_BLK_LEN 16 /* 128 bit block */ diff --git a/linux/net/ipsec/ipsec_alg_cryptoapi.c b/linux/net/ipsec/ipsec_alg_cryptoapi.c index 954ad78..8e348e1 100644 --- a/linux/net/ipsec/ipsec_alg_cryptoapi.c +++ b/linux/net/ipsec/ipsec_alg_cryptoapi.c @@ -96,11 +96,17 @@ #define DIGESTNAME_SHA1 "sha1" MODULE_AUTHOR("Juanjo Ciarlante, Harpo MAxx, Luciano Ruete"); static int debug_crypto=0; -MODULE_PARM(debug_crypto, "i"); static int test_crypto=0; -MODULE_PARM(test_crypto, "i"); static int excl_crypto=0; +#ifdef module_param +module_param(debug_crypto, int, 0664); +module_param(test_crypto, int, 0664); +module_param(excl_crypto, int, 0664); +#else +MODULE_PARM(debug_crypto, "i"); +MODULE_PARM(test_crypto, "i"); MODULE_PARM(excl_crypto, "i"); +#endif static int noauto = 0; MODULE_PARM(noauto,"i"); @@ -116,6 +122,17 @@ static int cast[] = {-1, -1}; static int serpent[] = {-1, -1}; static int twofish[] = {-1, -1}; +#ifdef module_param_array +#ifdef CONFIG_KLIPS_ENC_1DES +module_param_array(des_ede1,int,NULL,0); +#endif +module_param_array(des_ede3,int,NULL,0); +module_param_array(aes,int,NULL,0); +module_param_array(blowfish,int,NULL,0); +module_param_array(cast,int,NULL,0); +module_param_array(serpent,int,NULL,0); +module_param_array(twofish,int,NULL,0); +#else #ifdef CONFIG_KLIPS_ENC_1DES MODULE_PARM(des_ede1,"1-2i"); #endif @@ -125,6 +142,7 @@ MODULE_PARM(blowfish,"1-2i"); MODULE_PARM(cast,"1-2i"); MODULE_PARM(serpent,"1-2i"); MODULE_PARM(twofish,"1-2i"); +#endif MODULE_PARM_DESC(des_ede1, "0: disable | 1: force_enable | min,max: dontuse"); MODULE_PARM_DESC(des_ede3, "0: disable | 1: force_enable | min,max: dontuse"); MODULE_PARM_DESC(aes, "0: disable | 1: force_enable | min,max: keybitlens"); -- 1.4.2.rc2.g432f-dirty