diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-06-01 04:19:19 -0400 |
---|---|---|
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) |
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 47d67537f170..4d3883e20fc1 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -746,10 +746,10 @@ struct ieee80211_local { | |||
746 | struct mutex iflist_mtx; | 746 | struct mutex iflist_mtx; |
747 | 747 | ||
748 | /* | 748 | /* |
749 | * Key lock, protects sdata's key_list and sta_info's | 749 | * Key mutex, protects sdata's key_list and sta_info's |
750 | * key pointers (write access, they're RCU.) | 750 | * key pointers (write access, they're RCU.) |
751 | */ | 751 | */ |
752 | spinlock_t key_lock; | 752 | struct mutex key_mtx; |
753 | 753 | ||
754 | 754 | ||
755 | /* Scanning and BSS list */ | 755 | /* Scanning and BSS list */ |