Merge branch 'soc-part2' into soc

[~andy/linux] / drivers / staging / rtl8192e / rtllib_crypt_wep.c

diff --git a/drivers/staging/rtl8192e/rtllib_crypt_wep.c b/drivers/staging/rtl8192e/rtllib_crypt_wep.c
index c59bf10fe780437dd10449da7c703b1a5f31b50c..8cdf38913a330717444248fee3841b018a8fb491 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_crypt_wep.c
+++ b/drivers/staging/rtl8192e/rtllib_crypt_wep.c
@@ -9,7 +9,6 @@
  * more details.
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -38,10 +37,9 @@ static void *prism2_wep_init(int keyidx)
 {
        struct prism2_wep_data *priv;
 
-       priv = kmalloc(sizeof(*priv), GFP_ATOMIC);
+       priv = kzalloc(sizeof(*priv), GFP_ATOMIC);
        if (priv == NULL)
                goto fail;
-       memset(priv, 0, sizeof(*priv));
        priv->key_idx = keyidx;
 
        priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
@@ -257,9 +255,8 @@ static char *prism2_wep_print_stats(char *p, void *priv)
        return p;
 }
 
-
-static struct rtllib_crypto_ops rtllib_crypt_wep = {
-       .name                   = "WEP",
+static struct lib80211_crypto_ops rtllib_crypt_wep = {
+       .name                   = "R-WEP",
        .init                   = prism2_wep_init,
        .deinit                 = prism2_wep_deinit,
        .encrypt_mpdu           = prism2_wep_encrypt,
@@ -269,24 +266,24 @@ static struct rtllib_crypto_ops rtllib_crypt_wep = {
        .set_key                = prism2_wep_set_key,
        .get_key                = prism2_wep_get_key,
        .print_stats            = prism2_wep_print_stats,
-       .extra_prefix_len       = 4, /* IV */
-       .extra_postfix_len      = 4, /* ICV */
+       .extra_mpdu_prefix_len  = 4,    /* IV */
+       .extra_mpdu_postfix_len = 4,    /* ICV */
        .owner                  = THIS_MODULE,
 };
 
 
 int __init rtllib_crypto_wep_init(void)
 {
-       return rtllib_register_crypto_ops(&rtllib_crypt_wep);
+       return lib80211_register_crypto_ops(&rtllib_crypt_wep);
 }
 
 
 void __exit rtllib_crypto_wep_exit(void)
 {
-       rtllib_unregister_crypto_ops(&rtllib_crypt_wep);
+       lib80211_unregister_crypto_ops(&rtllib_crypt_wep);
 }
 
-void rtllib_wep_null(void)
-{
-       return;
-}
+module_init(rtllib_crypto_wep_init);
+module_exit(rtllib_crypto_wep_exit);
+
+MODULE_LICENSE("GPL");