git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
net
/
ieee80211
/
ieee80211_crypt.c
diff --git
a/net/ieee80211/ieee80211_crypt.c
b/net/ieee80211/ieee80211_crypt.c
index
ecc9bb1
..
5ed0a98
100644
(file)
--- a/
net/ieee80211/ieee80211_crypt.c
+++ b/
net/ieee80211/ieee80211_crypt.c
@@
-18,7
+18,6
@@
#include <linux/string.h>
#include <net/ieee80211.h>
#include <linux/string.h>
#include <net/ieee80211.h>
-
MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("HostAP crypto");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("HostAP crypto");
MODULE_LICENSE("GPL");
@@
-33,11
+32,11
@@
static DEFINE_SPINLOCK(ieee80211_crypto_lock);
void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, int force)
{
void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, int force)
{
- struct ieee80211_crypt_data *entry, *next;
+ struct ieee80211_crypt_data *entry, *next;
unsigned long flags;
spin_lock_irqsave(&ieee->lock, flags);
unsigned long flags;
spin_lock_irqsave(&ieee->lock, flags);
- list_for_each_entry_safe(entry, next, &ieee->crypt_deinit_list, list) {
+ list_for_each_entry_safe(entry, next, &ieee->crypt_deinit_list, list) {
if (atomic_read(&entry->refcnt) != 0 && !force)
continue;
if (atomic_read(&entry->refcnt) != 0 && !force)
continue;
@@
-111,11
+110,10
@@
int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops)
unsigned long flags;
struct ieee80211_crypto_alg *alg;
unsigned long flags;
struct ieee80211_crypto_alg *alg;
- alg = k
m
alloc(sizeof(*alg), GFP_KERNEL);
+ alg = k
z
alloc(sizeof(*alg), GFP_KERNEL);
if (alg == NULL)
return -ENOMEM;
if (alg == NULL)
return -ENOMEM;
- memset(alg, 0, sizeof(*alg));
alg->ops = ops;
spin_lock_irqsave(&ieee80211_crypto_lock, flags);
alg->ops = ops;
spin_lock_irqsave(&ieee80211_crypto_lock, flags);
@@
-141,9
+139,9
@@
int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
return -EINVAL;
spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
return -EINVAL;
- found:
+
found:
printk(KERN_DEBUG "ieee80211_crypt: unregistered algorithm "
printk(KERN_DEBUG "ieee80211_crypt: unregistered algorithm "
-
"'%s'\n", ops->name);
+ "'%s'\n", ops->name);
list_del(&alg->list);
spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
kfree(alg);
list_del(&alg->list);
spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
kfree(alg);
@@
-163,7
+161,7
@@
struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name)
spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
return NULL;
spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
return NULL;
- found:
+
found:
spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
return alg->ops;
}
spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
return alg->ops;
}