From 3b148be0df8e45a0259d7e84001cf02e897af614 Mon Sep 17 00:00:00 2001 From: Sean MacLennan Date: Mon, 19 Dec 2011 23:23:08 -0500 Subject: staging/rtl8192e: Register against lib80211 Convert rtllib from registering the crypt drivers against rtllib_crypt and instead register the against lib80211. The crypto functions have R- prepended (R-CCMP, R-TKIP, R-WEP) so they will not clash with the lib80211 versions. We cannot use the lib80211 crypt drivers since the rtl8192e has some hardware support that is not handled by the lib80211 crypt drivers. Signed-off-by: Sean MacLennan Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/staging/rtl8192e/rtllib_crypt_ccmp.c') diff --git a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c index f4e52b9223f..4217b88e6fc 100644 --- a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c +++ b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c @@ -428,7 +428,7 @@ static char *rtllib_ccmp_print_stats(char *p, void *priv) } static struct lib80211_crypto_ops rtllib_crypt_ccmp = { - .name = "CCMP", + .name = "R-CCMP", .init = rtllib_ccmp_init, .deinit = rtllib_ccmp_deinit, .encrypt_mpdu = rtllib_ccmp_encrypt, @@ -446,13 +446,13 @@ static struct lib80211_crypto_ops rtllib_crypt_ccmp = { int __init rtllib_crypto_ccmp_init(void) { - return rtllib_register_crypto_ops(&rtllib_crypt_ccmp); + return lib80211_register_crypto_ops(&rtllib_crypt_ccmp); } void __exit rtllib_crypto_ccmp_exit(void) { - rtllib_unregister_crypto_ops(&rtllib_crypt_ccmp); + lib80211_unregister_crypto_ops(&rtllib_crypt_ccmp); } module_init(rtllib_crypto_ccmp_init); -- cgit v1.2.3-70-g09d2