diff options
| author | Sean MacLennan <seanm@seanm.ca> | 2011-12-19 23:23:08 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-22 13:48:59 -0800 |
| commit | 3b148be0df8e45a0259d7e84001cf02e897af614 (patch) | |
| tree | cfd94e59751c9f102590b1dd348b488f60708366 /drivers/staging/rtl8192e/rtllib_crypt_tkip.c | |
| parent | 0ddcf5fdfac6bd80e153ee5c405bdfc9cb868b95 (diff) | |
| download | op-kernel-dev-3b148be0df8e45a0259d7e84001cf02e897af614.zip op-kernel-dev-3b148be0df8e45a0259d7e84001cf02e897af614.tar.gz | |
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 <seanm@seanm.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/rtllib_crypt_tkip.c')
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/rtl8192e/rtllib_crypt_tkip.c b/drivers/staging/rtl8192e/rtllib_crypt_tkip.c index 90e71d8..8009250 100644 --- a/drivers/staging/rtl8192e/rtllib_crypt_tkip.c +++ b/drivers/staging/rtl8192e/rtllib_crypt_tkip.c @@ -735,7 +735,7 @@ static char *rtllib_tkip_print_stats(char *p, void *priv) } static struct lib80211_crypto_ops rtllib_crypt_tkip = { - .name = "TKIP", + .name = "R-TKIP", .init = rtllib_tkip_init, .deinit = rtllib_tkip_deinit, .encrypt_mpdu = rtllib_tkip_encrypt, @@ -754,13 +754,13 @@ static struct lib80211_crypto_ops rtllib_crypt_tkip = { int __init rtllib_crypto_tkip_init(void) { - return rtllib_register_crypto_ops(&rtllib_crypt_tkip); + return lib80211_register_crypto_ops(&rtllib_crypt_tkip); } void __exit rtllib_crypto_tkip_exit(void) { - rtllib_unregister_crypto_ops(&rtllib_crypt_tkip); + lib80211_unregister_crypto_ops(&rtllib_crypt_tkip); } module_init(rtllib_crypto_tkip_init); |
