diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-07-21 13:30:27 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-21 23:13:42 +0400 |
| commit | 7a17a33c0da37f8d24222c967550d19dabf13617 (patch) | |
| tree | 14e736fd4add85528d24c62b0b9268dde0d87eab /net/mac80211/ieee80211_i.h | |
| parent | bc05d19f4b884b1dbbce48912710ae3f972c89d2 (diff) | |
| download | linux-7a17a33c0da37f8d24222c967550d19dabf13617.tar.xz | |
mac80211: proper IBSS locking
IBSS has never had locking, instead relying on some
memory barriers etc. That's hard to get right, and
I think we had it wrong too until the previous patch.
Since this is not performance sensitive, it doesn't
make sense to have the maintenance overhead of that,
so add proper locking.
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 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index f9251d50192c..c6b5c2d3ffde 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -377,14 +377,11 @@ struct ieee80211_if_managed { int last_cqm_event_signal; }; -enum ieee80211_ibss_request { - IEEE80211_IBSS_REQ_RUN = 0, -}; - struct ieee80211_if_ibss { struct timer_list timer; - unsigned long request; + struct mutex mtx; + unsigned long last_scan_completed; u32 basic_rates; |