diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-16 19:37:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-16 19:37:51 -0700 |
| commit | 8c95b4773dd8d0415269ffad7301ef96d75be8ee (patch) | |
| tree | 996401ce91c2a652fcff690e2c8bf88f2014d307 /net/mac80211/ieee80211_i.h | |
| parent | bcff122d478b774f4fd5262f35eedebe2f2fb274 (diff) | |
| parent | 30b89b0f5e1313c8a5a039abeaa89248b6338d81 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.26
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index c642538e8282..8e53ce7ed444 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -102,7 +102,7 @@ struct ieee80211_sta_bss { u64 timestamp; int beacon_int; - int probe_resp; + bool probe_resp; unsigned long last_update; /* during assocation, we save an ERP value from a probe response so @@ -600,8 +600,7 @@ struct ieee80211_local { /* * The lock only protects the list, hash, timer and counter * against manipulation, reads are done in RCU. Additionally, - * the lock protects each BSS's TIM bitmap, a few items in - * STA info structures and various key pointers. + * the lock protects each BSS's TIM bitmap. */ spinlock_t sta_lock; unsigned long num_sta; @@ -635,6 +634,13 @@ struct ieee80211_local { struct list_head interfaces; + /* + * Key lock, protects sdata's key_list and sta_info's + * key pointers (write access, they're RCU.) + */ + spinlock_t key_lock; + + bool sta_sw_scanning; bool sta_hw_scanning; int scan_channel_idx; |