diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-06-01 10:19:19 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-03 14:10:46 -0400 |
commit | ad0e2b5a00dbec303e4682b403bb6703d11dcdb2 (patch) | |
tree | b7aeb06a284af0cfb4aa1de840592478b373f554 /net/mac80211/ieee80211_i.h | |
parent | efe4c457a1d4e56840c42bf2e409dc04e8ad4304 (diff) | |
download | op-kernel-dev-ad0e2b5a00dbec303e4682b403bb6703d11dcdb2.zip op-kernel-dev-ad0e2b5a00dbec303e4682b403bb6703d11dcdb2.tar.gz |
mac80211: simplify key locking
Since I recently made station management able
to sleep, I can now rework key management as
well; since it will no longer need a spinlock
and can also use a mutex instead, a bunch of
code to allow drivers' set_key to sleep while
key management is protected by a spinlock can
now be removed.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 47d6753..4d3883e 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -746,10 +746,10 @@ struct ieee80211_local { struct mutex iflist_mtx; /* - * Key lock, protects sdata's key_list and sta_info's + * Key mutex, protects sdata's key_list and sta_info's * key pointers (write access, they're RCU.) */ - spinlock_t key_lock; + struct mutex key_mtx; /* Scanning and BSS list */ |