1 files changed, 12 insertions, 8 deletions

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 06b3411530f2..a34bca2dc52f 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -256,12 +256,13 @@ struct ieee80211_mgd_work {
 
 /* flags used in struct ieee80211_if_managed.flags */
 enum ieee80211_sta_flags {
-        IEEE80211_STA_PROBEREQ_POLL     = BIT(3),
-        IEEE80211_STA_CONTROL_PORT      = BIT(4),
-        IEEE80211_STA_WMM_ENABLED       = BIT(5),
-        IEEE80211_STA_DISABLE_11N       = BIT(6),
-        IEEE80211_STA_CSA_RECEIVED      = BIT(7),
-        IEEE80211_STA_MFP_ENABLED       = BIT(8),
+        IEEE80211_STA_BEACON_POLL       = BIT(0),
+        IEEE80211_STA_CONNECTION_POLL   = BIT(1),
+        IEEE80211_STA_CONTROL_PORT      = BIT(2),
+        IEEE80211_STA_WMM_ENABLED       = BIT(3),
+        IEEE80211_STA_DISABLE_11N       = BIT(4),
+        IEEE80211_STA_CSA_RECEIVED      = BIT(5),
+        IEEE80211_STA_MFP_ENABLED       = BIT(6),
 };
 
 /* flags for MLME request */
@@ -271,11 +272,16 @@ enum ieee80211_sta_request {
 
 struct ieee80211_if_managed {
         struct timer_list timer;
+        struct timer_list conn_mon_timer;
+        struct timer_list bcn_mon_timer;
         struct timer_list chswitch_timer;
         struct work_struct work;
+        struct work_struct monitor_work;
         struct work_struct chswitch_work;
         struct work_struct beacon_loss_work;
 
+        unsigned long probe_timeout;
+
         struct mutex mtx;
         struct ieee80211_bss *associated;
         struct list_head work_list;
@@ -292,8 +298,6 @@ struct ieee80211_if_managed {
 
         unsigned long request;
 
-        unsigned long last_beacon;
-
         unsigned int flags;
 
         u32 beacon_crc;