mac80211: add beacon filtering support

[deliverable/linux.git] / net / mac80211 / ieee80211_i.h

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index ecbc8e0cb3e700f2d0361413f81c9b53e564afea..acba78e1a5ca5745bb102d126a9cc0fde4f41328 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -247,8 +247,9 @@ struct mesh_preq_queue {
 #define IEEE80211_STA_ASSOCIATED       BIT(4)
 #define IEEE80211_STA_PROBEREQ_POLL    BIT(5)
 #define IEEE80211_STA_CREATE_IBSS      BIT(6)
-#define IEEE80211_STA_MIXED_CELL       BIT(7)
+/* hole at 7, please re-use */
 #define IEEE80211_STA_WMM_ENABLED      BIT(8)
+/* hole at 9, please re-use */
 #define IEEE80211_STA_AUTO_SSID_SEL    BIT(10)
 #define IEEE80211_STA_AUTO_BSSID_SEL   BIT(11)
 #define IEEE80211_STA_AUTO_CHANNEL_SEL BIT(12)
@@ -256,6 +257,7 @@ struct mesh_preq_queue {
 #define IEEE80211_STA_TKIP_WEP_USED    BIT(14)
 #define IEEE80211_STA_CSA_RECEIVED     BIT(15)
 #define IEEE80211_STA_MFP_ENABLED      BIT(16)
+#define IEEE80211_STA_EXT_SME          BIT(17)
 /* flags for MLME request */
 #define IEEE80211_STA_REQ_SCAN 0
 #define IEEE80211_STA_REQ_DIRECT_PROBE 1
@@ -266,12 +268,14 @@ struct mesh_preq_queue {
 #define IEEE80211_AUTH_ALG_OPEN BIT(0)
 #define IEEE80211_AUTH_ALG_SHARED_KEY BIT(1)
 #define IEEE80211_AUTH_ALG_LEAP BIT(2)
+#define IEEE80211_AUTH_ALG_FT BIT(3)
 
 struct ieee80211_if_managed {
        struct timer_list timer;
        struct timer_list chswitch_timer;
        struct work_struct work;
        struct work_struct chswitch_work;
+       struct work_struct beacon_loss_work;
 
        u8 bssid[ETH_ALEN], prev_bssid[ETH_ALEN];
 
@@ -305,6 +309,7 @@ struct ieee80211_if_managed {
        unsigned long request;
 
        unsigned long last_probe;
+       unsigned long last_beacon;
 
        unsigned int flags;
 
@@ -321,20 +326,8 @@ struct ieee80211_if_managed {
        int wmm_last_param_set;
 
        /* Extra IE data for management frames */
-       u8 *ie_probereq;
-       size_t ie_probereq_len;
-       u8 *ie_proberesp;
-       size_t ie_proberesp_len;
-       u8 *ie_auth;
-       size_t ie_auth_len;
-       u8 *ie_assocreq;
-       size_t ie_assocreq_len;
-       u8 *ie_reassocreq;
-       size_t ie_reassocreq_len;
-       u8 *ie_deauth;
-       size_t ie_deauth_len;
-       u8 *ie_disassoc;
-       size_t ie_disassoc_len;
+       u8 *sme_auth_ie;
+       size_t sme_auth_ie_len;
 };
 
 enum ieee80211_ibss_flags {
@@ -421,7 +414,6 @@ struct ieee80211_if_mesh {
  *
  * @IEEE80211_SDATA_ALLMULTI: interface wants all multicast packets
  * @IEEE80211_SDATA_PROMISC: interface is promisc
- * @IEEE80211_SDATA_USERSPACE_MLME: userspace MLME is active
  * @IEEE80211_SDATA_OPERATING_GMODE: operating in G-only mode
  * @IEEE80211_SDATA_DONT_BRIDGE_PACKETS: bridge packets between
  *     associated stations and deliver multicast frames both
@@ -430,9 +422,8 @@ struct ieee80211_if_mesh {
 enum ieee80211_sub_if_data_flags {
        IEEE80211_SDATA_ALLMULTI                = BIT(0),
        IEEE80211_SDATA_PROMISC                 = BIT(1),
-       IEEE80211_SDATA_USERSPACE_MLME          = BIT(2),
-       IEEE80211_SDATA_OPERATING_GMODE         = BIT(3),
-       IEEE80211_SDATA_DONT_BRIDGE_PACKETS     = BIT(4),
+       IEEE80211_SDATA_OPERATING_GMODE         = BIT(2),
+       IEEE80211_SDATA_DONT_BRIDGE_PACKETS     = BIT(3),
 };
 
 struct ieee80211_sub_if_data {
@@ -598,6 +589,7 @@ enum queue_stop_reason {
        IEEE80211_QUEUE_STOP_REASON_PS,
        IEEE80211_QUEUE_STOP_REASON_CSA,
        IEEE80211_QUEUE_STOP_REASON_AGGREGATION,
+       IEEE80211_QUEUE_STOP_REASON_SUSPEND,
 };
 
 struct ieee80211_master_priv {
@@ -774,6 +766,7 @@ struct ieee80211_local {
                struct dentry *total_ps_buffered;
                struct dentry *wep_iv;
                struct dentry *tsf;
+               struct dentry *reset;
                struct dentry *statistics;
                struct local_debugfsdentries_statsdentries {
                        struct dentry *transmitted_fragment_count;
@@ -969,9 +962,10 @@ ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata,
                  struct sk_buff *skb,
                  struct ieee80211_rx_status *rx_status);
 int ieee80211_sta_set_extra_ie(struct ieee80211_sub_if_data *sdata,
-                              char *ie, size_t len);
+                              const char *ie, size_t len);
 
 void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local);
+void ieee80211_scan_failed(struct ieee80211_local *local);
 int ieee80211_start_scan(struct ieee80211_sub_if_data *scan_sdata,
                         struct cfg80211_scan_request *req);
 struct ieee80211_bss *
@@ -1052,8 +1046,19 @@ void ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata,
                                 u8 pwr_constr_elem_len);
 
 /* Suspend/resume */
+#ifdef CONFIG_PM
 int __ieee80211_suspend(struct ieee80211_hw *hw);
 int __ieee80211_resume(struct ieee80211_hw *hw);
+#else
+static inline int __ieee80211_suspend(struct ieee80211_hw *hw)
+{
+       return 0;
+}
+static inline int __ieee80211_resume(struct ieee80211_hw *hw)
+{
+       return 0;
+}
+#endif
 
 /* utility functions/constants */
 extern void *mac80211_wiphy_privid; /* for wiphy privid */
@@ -1080,6 +1085,9 @@ void ieee80211_dynamic_ps_timer(unsigned long data);
 void ieee80211_send_nullfunc(struct ieee80211_local *local,
                             struct ieee80211_sub_if_data *sdata,
                             int powersave);
+void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata,
+                            struct ieee80211_hdr *hdr);
+void ieee80211_beacon_loss_work(struct work_struct *work);
 
 void ieee80211_wake_queues_by_reason(struct ieee80211_hw *hw,
                                     enum queue_stop_reason reason);