---

yaml --- r: 183397 b: refs/heads/master c: 63f170e h: refs/heads/master i: 183395: ea29c75 v: v3
git-mirror · Dec 28, 2009 · ccb2b7f · ccb2b7f
1 parent ef6acb4
commit ccb2b7f
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 104 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a80f7c0b088187c8471b441d461e937991870661
+refs/heads/master: 63f170e0c80a131cdd549fab7afb5036009944fc
diff --git a/trunk/net/mac80211/ieee80211_i.h b/trunk/net/mac80211/ieee80211_i.h
@@ -228,7 +228,7 @@ struct mesh_preq_queue {
 };
 
 enum ieee80211_mgd_state {
-	IEEE80211_MGD_STATE_IDLE,
+	IEEE80211_MGD_STATE_INVALID,
 	IEEE80211_MGD_STATE_PROBE,
 	IEEE80211_MGD_STATE_AUTH,
 	IEEE80211_MGD_STATE_ASSOC,
@@ -285,7 +285,6 @@ struct ieee80211_if_managed {
 
 	struct mutex mtx;
 	struct ieee80211_bss *associated;
-	struct ieee80211_mgd_work *old_associate_work;
 	struct list_head work_list;
 
 	u8 bssid[ETH_ALEN];