1 files changed, 43 insertions, 36 deletions

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index d47e8c110b16..74594f012cd3 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -280,10 +280,6 @@ struct mesh_preq_queue {
 
 enum ieee80211_work_type {
         IEEE80211_WORK_ABORT,
-        IEEE80211_WORK_DIRECT_PROBE,
-        IEEE80211_WORK_AUTH,
-        IEEE80211_WORK_ASSOC_BEACON_WAIT,
-        IEEE80211_WORK_ASSOC,
         IEEE80211_WORK_REMAIN_ON_CHANNEL,
         IEEE80211_WORK_OFFCHANNEL_TX,
 };
@@ -316,36 +312,10 @@ struct ieee80211_work {
         unsigned long timeout;
         enum ieee80211_work_type type;
 
-        u8 filter_ta[ETH_ALEN];
-
         bool started;
 
         union {
                 struct {
-                        int tries;
-                        u16 algorithm, transaction;
-                        u8 ssid[IEEE80211_MAX_SSID_LEN];
-                        u8 ssid_len;
-                        u8 key[WLAN_KEY_LEN_WEP104];
-                        u8 key_len, key_idx;
-                        bool privacy;
-                        bool synced;
-                } probe_auth;
-                struct {
-                        struct cfg80211_bss *bss;
-                        const u8 *supp_rates;
-                        const u8 *ht_information_ie;
-                        enum ieee80211_smps_mode smps;
-                        int tries;
-                        u16 capability;
-                        u8 prev_bssid[ETH_ALEN];
-                        u8 ssid[IEEE80211_MAX_SSID_LEN];
-                        u8 ssid_len;
-                        u8 supp_rates_len;
-                        bool wmm_used, use_11n, uapsd_used;
-                        bool synced;
-                } assoc;
-                struct {
                         u32 duration;
                 } remain;
                 struct {
@@ -355,9 +325,8 @@ struct ieee80211_work {
                 } offchan_tx;
         };
 
-        int ie_len;
-        /* must be last */
-        u8 ie[0];
+        size_t data_len;
+        u8 data[];
 };
 
 /* flags used in struct ieee80211_if_managed.flags */
@@ -373,6 +342,43 @@ enum ieee80211_sta_flags {
         IEEE80211_STA_RESET_SIGNAL_AVE  = BIT(9),
 };
 
+struct ieee80211_mgd_auth_data {
+        struct cfg80211_bss *bss;
+        unsigned long timeout;
+        int tries;
+        u16 algorithm, expected_transaction;
+
+        u8 key[WLAN_KEY_LEN_WEP104];
+        u8 key_len, key_idx;
+        bool synced;
+        bool done;
+
+        size_t ie_len;
+        u8 ie[];
+};
+
+struct ieee80211_mgd_assoc_data {
+        struct cfg80211_bss *bss;
+        const u8 *supp_rates;
+        const u8 *ht_information_ie;
+
+        unsigned long timeout;
+        int tries;
+
+        u16 capability;
+        u8 prev_bssid[ETH_ALEN];
+        u8 ssid[IEEE80211_MAX_SSID_LEN];
+        u8 ssid_len;
+        u8 supp_rates_len;
+        bool wmm_used, uapsd_used;
+        bool have_beacon;
+        bool sent_assoc;
+        bool synced;
+
+        size_t ie_len;
+        u8 ie[];
+};
+
 struct ieee80211_if_managed {
         struct timer_list timer;
         struct timer_list conn_mon_timer;
@@ -389,6 +395,8 @@ struct ieee80211_if_managed {
 
         struct mutex mtx;
         struct cfg80211_bss *associated;
+        struct ieee80211_mgd_auth_data *auth_data;
+        struct ieee80211_mgd_assoc_data *assoc_data;
 
         u8 bssid[ETH_ALEN];
 
@@ -470,6 +478,8 @@ struct ieee80211_if_ibss {
         bool fixed_channel;
         bool privacy;
 
+        bool control_port;
+
         u8 bssid[ETH_ALEN];
         u8 ssid[IEEE80211_MAX_SSID_LEN];
         u8 ssid_len, ie_len;
@@ -770,7 +780,6 @@ struct ieee80211_local {
         struct list_head work_list;
         struct timer_list work_timer;
         struct work_struct work_work;
-        struct sk_buff_head work_skb_queue;
 
         /*
          * private workqueue to mac80211. mac80211 makes this accessible
@@ -1437,8 +1446,6 @@ void ieee80211_work_init(struct ieee80211_local *local);
 void ieee80211_add_work(struct ieee80211_work *wk);
 void free_work(struct ieee80211_work *wk);
 void ieee80211_work_purge(struct ieee80211_sub_if_data *sdata);
-ieee80211_rx_result ieee80211_work_rx_mgmt(struct ieee80211_sub_if_data *sdata,
-                                           struct sk_buff *skb);
 int ieee80211_wk_remain_on_channel(struct ieee80211_sub_if_data *sdata,
                                    struct ieee80211_channel *chan,
                                    enum nl80211_channel_type channel_type,