lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[MAC80211]: remove krefs for keys

Browse Source 
they aren't really refcounted anyway

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Johannes Berg
2007-08-28 17:01:54 -04:00
committed by David S. Miller
parent 8f20fc2498
commit 8f37171a62
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/ieee80211_key.h
View File

@@ -11,7 +11,7 @@
#define IEEE80211_KEY_H #define IEEE80211_KEY_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/kref.h> #include <linux/list.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <net/mac80211.h> #include <net/mac80211.h>
@@ -42,8 +42,6 @@
#define NUM_RX_DATA_QUEUES 17 #define NUM_RX_DATA_QUEUES 17
struct ieee80211_key { struct ieee80211_key {
struct kref kref;
union { union {
struct { struct {
/* last used TSC */ /* last used TSC */

13
net/mac80211/key.c
View File

@@ -21,23 +21,16 @@ struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
key = kzalloc(sizeof(struct ieee80211_key) + key_len, flags); key = kzalloc(sizeof(struct ieee80211_key) + key_len, flags);
if (!key) if (!key)
return NULL; return NULL;
kref_init(&key->kref);
return key; return key;
} }
static void ieee80211_key_release(struct kref *kref) void ieee80211_key_free(struct ieee80211_key *key)
{ {
struct ieee80211_key *key; if (!key)
return;
key = container_of(kref, struct ieee80211_key, kref);
if (key->conf.alg == ALG_CCMP) if (key->conf.alg == ALG_CCMP)
ieee80211_aes_key_free(key->u.ccmp.tfm); ieee80211_aes_key_free(key->u.ccmp.tfm);
ieee80211_debugfs_key_remove(key); ieee80211_debugfs_key_remove(key);
kfree(key); kfree(key);
} }
void ieee80211_key_free(struct ieee80211_key *key)
{
if (key)
kref_put(&key->kref, ieee80211_key_release);
}