summaryrefslogtreecommitdiffstats
path: root/net/mac80211/key.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-05-12 14:31:49 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-05-12 14:10:53 -0400
commit5c0c36412b2dc6b1e243c7e9115306fe286583b7 (patch)
treea189957b3a8e939d19da304541ba087f1264085a /net/mac80211/key.h
parentdea4096bc41a9642039840ced91e585d04883a16 (diff)
downloadlinux-5c0c36412b2dc6b1e243c7e9115306fe286583b7.tar.bz2
mac80211: make key locking clearer
The code in ieee80211_del_key() doesn't acquire the key_mtx properly when it dereferences the keys. It turns out that isn't actually necessary since the key_mtx itself seems to be redundant since all key manipulations are done under the RTNL, but as long as we have the key_mtx we should use it the right way too. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/key.h')
-rw-r--r--net/mac80211/key.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/key.h b/net/mac80211/key.h
index 4ddbe27eb570..e5432ef8b203 100644
--- a/net/mac80211/key.h
+++ b/net/mac80211/key.h
@@ -135,6 +135,7 @@ struct ieee80211_key *ieee80211_key_alloc(u32 cipher, int idx, size_t key_len,
int __must_check ieee80211_key_link(struct ieee80211_key *key,
struct ieee80211_sub_if_data *sdata,
struct sta_info *sta);
+void __ieee80211_key_free(struct ieee80211_key *key);
void ieee80211_key_free(struct ieee80211_local *local,
struct ieee80211_key *key);
void ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, int idx,