diff options
| author | Johannes Berg | 2010-06-01 10:19:19 +0200 |
|---|---|---|
| committer | John W. Linville | 2010-06-03 20:10:46 +0200 |
| commit | ad0e2b5a00dbec303e4682b403bb6703d11dcdb2 (patch) | |
| tree | b7aeb06a284af0cfb4aa1de840592478b373f554 /net/mac80211/main.c | |
| parent | drivers/net/wireless/ipw2x00/ipw2100.c: Remove unnecessary kmalloc casts (diff) | |
| download | kernel-qcow2-linux-ad0e2b5a00dbec303e4682b403bb6703d11dcdb2.tar.gz kernel-qcow2-linux-ad0e2b5a00dbec303e4682b403bb6703d11dcdb2.tar.xz kernel-qcow2-linux-ad0e2b5a00dbec303e4682b403bb6703d11dcdb2.zip | |
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/main.c')
| -rw-r--r-- | net/mac80211/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 4051b232c6e6..045ead9507aa 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -448,7 +448,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, mutex_init(&local->iflist_mtx); mutex_init(&local->scan_mtx); - spin_lock_init(&local->key_lock); + mutex_init(&local->key_mtx); spin_lock_init(&local->filter_lock); spin_lock_init(&local->queue_stop_reason_lock); |