Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
---
drivers/staging/rtl8192e/internal.h | 10 ----------
drivers/staging/rtl8192e/rtl_core.c | 26 --------------------------
drivers/staging/rtl8192e/rtl_crypto.h | 10 ----------
3 files changed, 0 insertions(+), 46 deletions(-)
diff --git a/drivers/staging/rtl8192e/internal.h b/drivers/staging/rtl8192e/internal.h
index 3041f0f..00139c2 100644
--- a/drivers/staging/rtl8192e/internal.h
+++ b/drivers/staging/rtl8192e/internal.h
@@ -23,16 +23,6 @@
#include <linux/sched.h>
#include <asm/kmap_types.h>
-#ifdef BUILT_IN_CRYPTO
-#ifdef CONFIG_CRYPTO_HMAC
-#undef CONFIG_CRYPTO_HMAC
-#endif
-
-#ifdef CONFIG_KMOD
-#undef CONFIG_KMOD
-#endif
-#endif /* BUILT_IN_CRYPTO */
-
extern enum km_type crypto_km_types[];
static inline enum km_type crypto_kmap_type(int out)
diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c
index 7fb33c9..7c89ed8 100644
--- a/drivers/staging/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl_core.c
@@ -3255,26 +3255,6 @@ static int __init rtl8192_pci_module_init(void)
int ret;
int error;
-#ifdef BUILT_IN_CRYPTO
- ret = arc4_init();
- if (ret) {
- printk(KERN_ERR "arc4_init() failed %d\n", ret);
- return ret;
- }
-
-
- ret = michael_mic_init();
- if (ret) {
- printk(KERN_ERR "michael_mic_init() failed %d\n", ret);
- return ret;
- }
-
- ret = aes_init();
- if (ret) {
- printk(KERN_ERR "aes_init() failed %d\n", ret);
- return ret;
- }
-#endif
ret = rtllib_init();
if (ret) {
printk(KERN_ERR "rtllib_init() failed %d\n", ret);
@@ -3333,12 +3313,6 @@ static void __exit rtl8192_pci_module_exit(void)
rtllib_crypto_wep_exit();
rtllib_crypto_deinit();
rtllib_exit();
-#ifdef BUILT_IN_CRYPTO
- arc4_exit();
- michael_mic_exit();
- aes_fini();
-#endif
-
}
void check_rfctrl_gpio_timer(unsigned long data)
diff --git a/drivers/staging/rtl8192e/rtl_crypto.h b/drivers/staging/rtl8192e/rtl_crypto.h
index 6f445c5..a8df410 100644
--- a/drivers/staging/rtl8192e/rtl_crypto.h
+++ b/drivers/staging/rtl8192e/rtl_crypto.h
@@ -24,16 +24,6 @@
#include <asm/page.h>
#include <asm/errno.h>
-#ifdef BUILT_IN_CRYPTO
-#ifdef CONFIG_CRYPTO_HMAC
-#undef CONFIG_CRYPTO_HMAC
-#endif
-
-#ifdef CONFIG_KMOD
-#undef CONFIG_KMOD
-#endif
-#endif /* BUILT_IN_CRYPTO */
-
#define crypto_register_alg crypto_register_alg_rsl
#define crypto_unregister_alg crypto_unregister_alg_rsl
#define crypto_alloc_tfm crypto_alloc_tfm_rsl
--
1.7.3.4
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
