---

yaml --- r: 278983 b: refs/heads/master c: 4d33960 h: refs/heads/master i: 278981: e13735a 278979: e950492 278975: 7018796 v: v3
git-mirror · Dec 15, 2011 · f47f436 · f47f436
1 parent 6e695a1
commit f47f436
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 204 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bf11d8d081106c3cce8281a0150e716f8ac5d22
+refs/heads/master: 4d33960bf9fa2c0ee82ba7120e7b56c766dd3a86
diff --git a/trunk/net/mac80211/ieee80211_i.h b/trunk/net/mac80211/ieee80211_i.h
@@ -855,18 +855,15 @@ struct ieee80211_local {
 
 	/* Station data */
 	/*
-	 * The mutex only protects the list and counter,
-	 * reads are done in RCU.
-	 * Additionally, the lock protects the hash table,
-	 * the pending list and each BSS's TIM bitmap.
+	 * The mutex only protects the list, hash table and
+	 * counter, reads are done with RCU.
 	 */
 	struct mutex sta_mtx;
-	spinlock_t sta_lock;
+	spinlock_t tim_lock;
 	unsigned long num_sta;
-	struct list_head sta_list, sta_pending_list;
+	struct list_head sta_list;
 	struct sta_info __rcu *sta_hash[STA_HASH_SIZE];
 	struct timer_list sta_cleanup;
-	struct work_struct sta_finish_work;
 	int sta_generation;
 
 	struct sk_buff_head pending[IEEE80211_MAX_QUEUES];