aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index c642538e8282..ce566f3e0169 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -600,8 +600,7 @@ struct ieee80211_local {
600 /* 600 /*
601 * The lock only protects the list, hash, timer and counter 601 * The lock only protects the list, hash, timer and counter
602 * against manipulation, reads are done in RCU. Additionally, 602 * against manipulation, reads are done in RCU. Additionally,
603 * the lock protects each BSS's TIM bitmap, a few items in 603 * the lock protects each BSS's TIM bitmap.
604 * STA info structures and various key pointers.
605 */ 604 */
606 spinlock_t sta_lock; 605 spinlock_t sta_lock;
607 unsigned long num_sta; 606 unsigned long num_sta;
@@ -635,6 +634,13 @@ struct ieee80211_local {
635 634
636 struct list_head interfaces; 635 struct list_head interfaces;
637 636
637 /*
638 * Key lock, protects sdata's key_list and sta_info's
639 * key pointers (write access, they're RCU.)
640 */
641 spinlock_t key_lock;
642
643
638 bool sta_sw_scanning; 644 bool sta_sw_scanning;
639 bool sta_hw_scanning; 645 bool sta_hw_scanning;
640 int scan_channel_idx; 646 int scan_channel_idx;