diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-08-28 17:01:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:48:51 -0700 |
| commit | 8f37171a6243a8370211a1e86d58be683ccf01f0 (patch) | |
| tree | 3ca7a5eeed89cbd9ea6d86ddffa0a30ed2b4a3c6 | |
| parent | 8f20fc24986a083228823d9b68adca20714b254e (diff) | |
[MAC80211]: remove krefs for keys
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>
| -rw-r--r-- | net/mac80211/ieee80211_key.h | 4 | ||||
| -rw-r--r-- | net/mac80211/key.c | 13 |
2 files changed, 4 insertions, 13 deletions
diff --git a/net/mac80211/ieee80211_key.h b/net/mac80211/ieee80211_key.h index 1b5e539c678f..58e192530826 100644 --- a/net/mac80211/ieee80211_key.h +++ b/net/mac80211/ieee80211_key.h @@ -11,7 +11,7 @@ #define IEEE80211_KEY_H #include <linux/types.h> -#include <linux/kref.h> +#include <linux/list.h> #include <linux/crypto.h> #include <net/mac80211.h> @@ -42,8 +42,6 @@ #define NUM_RX_DATA_QUEUES 17 struct ieee80211_key { - struct kref kref; - union { struct { /* last used TSC */ diff --git a/net/mac80211/key.c b/net/mac80211/key.c index 92d994f090b6..843d1577f00f 100644 --- a/net/mac80211/key.c +++ b/net/mac80211/key.c @@ -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); if (!key) return NULL; - kref_init(&key->kref); 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) ieee80211_aes_key_free(key->u.ccmp.tfm); ieee80211_debugfs_key_remove(key); kfree(key); } - -void ieee80211_key_free(struct ieee80211_key *key) -{ - if (key) - kref_put(&key->kref, ieee80211_key_release); -} |