8f20fc2498
This patch embeds the struct ieee80211_key_conf into struct ieee80211_key
and thus avoids allocations and having data present twice.
This required some more changes:
1) The removal of the IEEE80211_KEY_DEFAULT_TX_KEY key flag.
This flag isn't used by drivers nor should it be since
we have a set_key_idx() callback. Maybe that callback needs
to be extended to include the key conf, but only a driver that
requires it will tell.
2) The removal of the IEEE80211_KEY_DEFAULT_WEP_ONLY key flag.
This flag is global, so it shouldn't be passed in the key
conf structure. Pass it to the function instead.
Also, this patch removes the AID parameter to the set_key() callback
because it is currently unused and the hardware currently cannot know
about the AID anyway. I suspect this was used with some hardware that
actually selected the AID itself, but that functionality was removed.
Additionally, I've removed the ALG_NULL key algorithm since we have
ALG_NONE.
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>
44 lines
1.1 KiB
C
44 lines
1.1 KiB
C
/*
|
|
* Copyright 2002-2005, Instant802 Networks, Inc.
|
|
* Copyright 2005-2006, Devicescape Software, Inc.
|
|
* Copyright 2006-2007 Jiri Benc <jbenc@suse.cz>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <net/mac80211.h>
|
|
#include "ieee80211_i.h"
|
|
#include "debugfs_key.h"
|
|
#include "aes_ccm.h"
|
|
|
|
struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
|
|
int idx, size_t key_len, gfp_t flags)
|
|
{
|
|
struct ieee80211_key *key;
|
|
|
|
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)
|
|
{
|
|
struct ieee80211_key *key;
|
|
|
|
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);
|
|
}
|