diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-07-30 16:46:07 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-16 15:26:37 -0400 |
| commit | a1699b75a1db31a1da2f0fc610ee696d02a19280 (patch) | |
| tree | f10a936a42a4bd35b39496d64426b61e465c43a6 /net/mac80211/main.c | |
| parent | c240879f3488ae0904a7ba5bdaaa54638b2d8852 (diff) | |
mac80211: unify scan and work mutexes
Having both scan and work mutexes is not just
a bit too fine grained, it also creates issues
when there's code that needs both since they
then need to be acquired in the right order,
which can be hard to do.
Therefore, use just a single mutex for both.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 18b8df922c6..06b9608a213 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -482,7 +482,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, __hw_addr_init(&local->mc_list); mutex_init(&local->iflist_mtx); - mutex_init(&local->scan_mtx); + mutex_init(&local->mtx); mutex_init(&local->key_mtx); spin_lock_init(&local->filter_lock); @@ -791,7 +791,7 @@ void ieee80211_free_hw(struct ieee80211_hw *hw) struct ieee80211_local *local = hw_to_local(hw); mutex_destroy(&local->iflist_mtx); - mutex_destroy(&local->scan_mtx); + mutex_destroy(&local->mtx); wiphy_free(local->hw.wiphy); } |