Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f37171a authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[MAC80211]: remove krefs for keys 



they aren't really refcounted anyway

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-by: default avatarMichael Wu <flamingice@sourmilk.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8f20fc24

net/mac80211/ieee80211_key.h

+1 −3
Original line number Diff line number Diff line
@@ -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 */

net/mac80211/key.c

+3 −10
Original line number Diff line number Diff line
@@ -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);

}