diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-10-13 12:26:23 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-10-13 15:29:52 +0200 |
| commit | deaa397ea3d6c1ae5f7b6c089e8b805c02b293e5 (patch) | |
| tree | ba6bc6e4439e1e8b40361d1c1e59dcb0e1579d8c /backport/compat/main.c | |
| parent | b63923298a77174183a7abc9390bae5500703c05 (diff) | |
backports: remove CRYPTO_CCM backport
This never actually worked properly as far as I can tell,
and now it looks like it won't even compile due to the
real crypto_memneq() backport.
Just remove it - distro kernels have it enabled and all
others should just enable it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'backport/compat/main.c')
| -rw-r--r-- | backport/compat/main.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/backport/compat/main.c b/backport/compat/main.c index 5d45e3da..0bf04201 100644 --- a/backport/compat/main.c +++ b/backport/compat/main.c @@ -53,16 +53,10 @@ EXPORT_SYMBOL_GPL(backport_dependency_symbol); static int __init backport_init(void) { - int ret = crypto_ccm_module_init(); + int ret = devcoredump_init(); if (ret) return ret; - ret = devcoredump_init(); - if (ret) { - crypto_ccm_module_exit(); - return ret; - } - printk(KERN_INFO "Loading modules backported from " CPTCFG_KERNEL_NAME #ifndef BACKPORTS_GIT_TRACKED " version " CPTCFG_KERNEL_VERSION @@ -86,7 +80,6 @@ subsys_initcall(backport_init); static void __exit backport_exit(void) { - crypto_ccm_module_exit(); devcoredump_exit(); } module_exit(backport_exit); |