Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / staging / rtl8192e / rtllib_crypt.c

diff --git a/drivers/staging/rtl8192e/rtllib_crypt.c b/drivers/staging/rtl8192e/rtllib_crypt.c
index 313d089c24fa2839d3f71f8c821f4e36da71fe9c..86152d0e6b5dba3515dd5ba7d75ec351d16d0f6c 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_crypt.c
+++ b/drivers/staging/rtl8192e/rtllib_crypt.c
@@ -32,14 +32,14 @@ struct rtllib_crypto {
 
 static struct rtllib_crypto *hcrypt;
 
-void rtllib_crypt_deinit_entries(struct rtllib_device *ieee,
+void rtllib_crypt_deinit_entries(struct lib80211_crypt_info *info,
                                           int force)
 {
        struct list_head *ptr, *n;
        struct lib80211_crypt_data *entry;
 
-       for (ptr = ieee->crypt_deinit_list.next, n = ptr->next;
-            ptr != &ieee->crypt_deinit_list; ptr = n, n = ptr->next) {
+       for (ptr = info->crypt_deinit_list.next, n = ptr->next;
+            ptr != &info->crypt_deinit_list; ptr = n, n = ptr->next) {
                entry = list_entry(ptr, struct lib80211_crypt_data, list);
 
                if (atomic_read(&entry->refcnt) != 0 && !force)
@@ -56,24 +56,24 @@ EXPORT_SYMBOL(rtllib_crypt_deinit_entries);
 
 void rtllib_crypt_deinit_handler(unsigned long data)
 {
-       struct rtllib_device *ieee = (struct rtllib_device *)data;
+       struct lib80211_crypt_info *info = (struct lib80211_crypt_info *)data;
        unsigned long flags;
 
-       spin_lock_irqsave(&ieee->lock, flags);
-       rtllib_crypt_deinit_entries(ieee, 0);
-       if (!list_empty(&ieee->crypt_deinit_list)) {
+       spin_lock_irqsave(info->lock, flags);
+       rtllib_crypt_deinit_entries(info, 0);
+       if (!list_empty(&info->crypt_deinit_list)) {
                printk(KERN_DEBUG "%s: entries remaining in delayed crypt "
-                      "deletion list\n", ieee->dev->name);
-               ieee->crypt_deinit_timer.expires = jiffies + HZ;
-               add_timer(&ieee->crypt_deinit_timer);
+                      "deletion list\n", info->name);
+               info->crypt_deinit_timer.expires = jiffies + HZ;
+               add_timer(&info->crypt_deinit_timer);
        }
-       spin_unlock_irqrestore(&ieee->lock, flags);
+       spin_unlock_irqrestore(info->lock, flags);
 
 }
 EXPORT_SYMBOL(rtllib_crypt_deinit_handler);
 
-void rtllib_crypt_delayed_deinit(struct rtllib_device *ieee,
-                                   struct lib80211_crypt_data **crypt)
+void rtllib_crypt_delayed_deinit(struct lib80211_crypt_info *info,
+                                struct lib80211_crypt_data **crypt)
 {
        struct lib80211_crypt_data *tmp;
        unsigned long flags;
@@ -88,13 +88,13 @@ void rtllib_crypt_delayed_deinit(struct rtllib_device *ieee,
         * decrypt operations. Use a list of delayed deinits to avoid needing
         * locking. */
 
-       spin_lock_irqsave(&ieee->lock, flags);
-       list_add(&tmp->list, &ieee->crypt_deinit_list);
-       if (!timer_pending(&ieee->crypt_deinit_timer)) {
-               ieee->crypt_deinit_timer.expires = jiffies + HZ;
-               add_timer(&ieee->crypt_deinit_timer);
+       spin_lock_irqsave(info->lock, flags);
+       list_add(&tmp->list, &info->crypt_deinit_list);
+       if (!timer_pending(&info->crypt_deinit_timer)) {
+               info->crypt_deinit_timer.expires = jiffies + HZ;
+               add_timer(&info->crypt_deinit_timer);
        }
-       spin_unlock_irqrestore(&ieee->lock, flags);
+       spin_unlock_irqrestore(info->lock, flags);
 }
 EXPORT_SYMBOL(rtllib_crypt_delayed_deinit);
 
@@ -215,7 +215,7 @@ int __init rtllib_crypto_init(void)
        INIT_LIST_HEAD(&hcrypt->algs);
        spin_lock_init(&hcrypt->lock);
 
-       ret = rtllib_register_crypto_ops(&rtllib_crypt_null);
+       ret = lib80211_register_crypto_ops(&rtllib_crypt_null);
        if (ret < 0) {
                kfree(hcrypt);
                hcrypt = NULL;