aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/lantiq/ltq-deu
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-05-13 14:00:57 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-05-17 18:35:51 +0200
commitb510ab513e19a0ee4371aa23bb1a9f50aa2101e8 (patch)
treee12df8a820808a6ca2d1e95161935aad93cf7829 /package/kernel/lantiq/ltq-deu
parentc00b2df6c8e421ea7aa96f53178dc85db99f2305 (diff)
downloadupstream-b510ab513e19a0ee4371aa23bb1a9f50aa2101e8.tar.gz
upstream-b510ab513e19a0ee4371aa23bb1a9f50aa2101e8.tar.bz2
upstream-b510ab513e19a0ee4371aa23bb1a9f50aa2101e8.zip
kernel: drop outdated kernel version switches for local code
This drops kernel version switches for versions not supported by OpenWrt master at the moment. This only adjusts local code, but doesn't touch patches to existing external packages. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'package/kernel/lantiq/ltq-deu')
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c12
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_async_aes.c4
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_async_des.c14
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_des.c11
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c6
-rw-r--r--package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h4
6 files changed, 0 insertions, 51 deletions
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c
index 6c8d065d8b..76abfafb4e 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c
@@ -895,18 +895,6 @@ int ifxdeu_init_aes (void)
int ret = -ENOSYS;
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
- if (!disable_multiblock) {
- ifxdeu_aes_alg.cra_u.cipher.cia_max_nbytes = AES_BLOCK_SIZE; //(size_t)-1;
- ifxdeu_aes_alg.cra_u.cipher.cia_req_align = 16;
- ifxdeu_aes_alg.cra_u.cipher.cia_ecb = ifx_deu_aes_ecb;
- ifxdeu_aes_alg.cra_u.cipher.cia_cbc = ifx_deu_aes_cbc;
- ifxdeu_aes_alg.cra_u.cipher.cia_cfb = ifx_deu_aes_cfb;
- ifxdeu_aes_alg.cra_u.cipher.cia_ofb = ifx_deu_aes_ofb;
- }
-#endif
-
if ((ret = crypto_register_alg(&ifxdeu_aes_alg)))
goto aes_err;
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_async_aes.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_async_aes.c
index 15e1485912..dcd059371f 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_async_aes.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_async_aes.c
@@ -100,11 +100,7 @@ extern char debug_level;
static int disable_multiblock = 0;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
module_param(disable_multiblock, int, 0);
-#else
-MODULE_PARM_DESC(disable_multiblock, "Disable encryption of whole multiblock buffers");
-#endif
static int disable_deudma = 1;
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_async_des.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_async_des.c
index ea94c6460f..1523763ccd 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_async_des.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_async_des.c
@@ -117,11 +117,7 @@ struct des_ctx {
static int disable_multiblock = 0;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
module_param(disable_multiblock, int, 0);
-#else
-MODULE_PARM_DESC(disable_multiblock, "Disable encryption of whole multiblock buffers");
-#endif
static int disable_deudma = 1;
@@ -893,16 +889,6 @@ int __init lqdeu_async_des_init (void)
{
int i, j, ret = -EINVAL;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
- if (!disable_multiblock) {
- ifxdeu_des_alg.cra_u.cipher.cia_max_nbytes = DES_BLOCK_SIZE; //(size_t)-1;
- ifxdeu_des_alg.cra_u.cipher.cia_req_align = 16;
- ifxdeu_des_alg.cra_u.cipher.cia_ecb = ifx_deu_des_ecb;
- ifxdeu_des_alg.cra_u.cipher.cia_cbc = ifx_deu_des_cbc;
- ifxdeu_des_alg.cra_u.cipher.cia_cfb = ifx_deu_des_cfb;
- ifxdeu_des_alg.cra_u.cipher.cia_ofb = ifx_deu_des_ofb;
- }
-#endif
for (i = 0; i < ARRAY_SIZE(des_drivers_alg); i++) {
ret = crypto_register_alg(&des_drivers_alg[i].alg);
//printk("driver: %s\n", des_drivers_alg[i].alg.cra_name);
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_des.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_des.c
index beb67075ee..6d7d82fcb9 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_des.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_des.c
@@ -691,17 +691,6 @@ int ifxdeu_init_des (void)
int ret = -ENOSYS;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
- if (!disable_multiblock) {
- ifxdeu_des_alg.cra_u.cipher.cia_max_nbytes = DES_BLOCK_SIZE; //(size_t)-1;
- ifxdeu_des_alg.cra_u.cipher.cia_req_align = 16;
- ifxdeu_des_alg.cra_u.cipher.cia_ecb = ifx_deu_des_ecb;
- ifxdeu_des_alg.cra_u.cipher.cia_cbc = ifx_deu_des_cbc;
- ifxdeu_des_alg.cra_u.cipher.cia_cfb = ifx_deu_des_cfb;
- ifxdeu_des_alg.cra_u.cipher.cia_ofb = ifx_deu_des_ofb;
- }
-#endif
-
ret = crypto_register_alg(&ifxdeu_des_alg);
if (ret < 0)
goto des_err;
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c
index 05f168160b..3947b31a40 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c
@@ -171,14 +171,8 @@ static int ltq_deu_remove(struct platform_device *pdev)
int disable_multiblock = 0;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
module_param(disable_multiblock,int,0);
-#else
-//MODULE_PARM (disable_multiblock, "i");
-MODULE_PARM_DESC (disable_multiblock,
- "Disable encryption of whole multiblock buffers.");
-#endif
static const struct of_device_id ltq_deu_match[] = {
#ifdef CONFIG_DANUBE
diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h
index b64d74776b..7a1b85f1d1 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h
@@ -54,11 +54,7 @@ typedef struct ifx_deu_device {
int recv_count;
int packet_size;
int packet_num;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0))
wait_queue_entry_t wait;
-#else
- wait_queue_t wait;
-#endif
} _ifx_deu_device;
extern _ifx_deu_device ifx_deu[1];