Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking merge from David Miller: "1) Move ixgbe driver over to purely page based buffering on receive. From Alexander Duyck. 2) Add receive packet steering support to e1000e, from Bruce Allan. 3) Convert TCP MD5 support over to RCU, from Eric Dumazet. 4) Reduce cpu usage in handling out-of-order TCP packets on modern systems, also from Eric Dumazet. 5) Support the IP{,V6}_UNICAST_IF socket options, making the wine folks happy, from Erich Hoover. 6) Support VLAN trunking from guests in hyperv driver, from Haiyang Zhang. 7) Support byte-queue-limtis in r8169, from Igor Maravic. 8) Outline code intended for IP_RECVTOS in IP_PKTOPTIONS existed but was never properly implemented, Jiri Benc fixed that. 9) 64-bit statistics support in r8169 and 8139too, from Junchang Wang. 10) Support kernel side dump filtering by ctmark in netfilter ctnetlink, from Pablo Neira Ayuso. 11) Support byte-queue-limits in gianfar driver, from Paul Gortmaker. 12) Add new peek socket options to assist with socket migration, from Pavel Emelyanov. 13) Add sch_plug packet scheduler whose queue is controlled by userland daemons using explicit freeze and release commands. From Shriram Rajagopalan. 14) Fix FCOE checksum offload handling on transmit, from Yi Zou." * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1846 commits) Fix pppol2tp getsockname() Remove printk from rds_sendmsg ipv6: fix incorrent ipv6 ipsec packet fragment cpsw: Hook up default ndo_change_mtu. net: qmi_wwan: fix build error due to cdc-wdm dependecy netdev: driver: ethernet: Add TI CPSW driver netdev: driver: ethernet: add cpsw address lookup engine support phy: add am79c874 PHY support mlx4_core: fix race on comm channel bonding: send igmp report for its master fs_enet: Add MPC5125 FEC support and PHY interface selection net: bpf_jit: fix BPF_S_LDX_B_MSH compilation net: update the usage of CHECKSUM_UNNECESSARY fcoe: use CHECKSUM_UNNECESSARY instead of CHECKSUM_PARTIAL on tx net: do not do gso for CHECKSUM_UNNECESSARY in netif_needs_gso ixgbe: Fix issues with SR-IOV loopback when flow control is disabled net/hyperv: Fix the code handling tx busy ixgbe: fix namespace issues when FCoE/DCB is not enabled rtlwifi: Remove unused ETH_ADDR_LEN defines igbvf: Use ETH_ALEN ... Fix up fairly trivial conflicts in drivers/isdn/gigaset/interface.c and drivers/net/usb/{Kconfig,qmi_wwan.c} as per David.
author: Linus Torvalds <torvalds@linux-foundation.org> 2012-03-21 00:04:47 -0400
committer: Linus Torvalds <torvalds@linux-foundation.org> 2012-03-21 00:04:47 -0400
commit: 3b59bf081622b6446db77ad06c93fe23677bc533 (patch)
tree: 3f4bb5a27c90cc86994a1f6d3c53fbf9208003cb /net/mac80211
parent: e45836fafe157df137a837093037f741ad8f4c90 (diff)
parent: bbdb32cb5b73597386913d052165423b9d736145 (diff)
34 files changed, 2373 insertions, 2266 deletions
diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index d540c3b160f3..1be7a454aa77 100644
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -9,7 +9,7 @@ mac80211-y := \
        scan.o offchannel.o \
        ht.o agg-tx.o agg-rx.o \
        ibss.o \
-        mlme.o work.o \
+        work.o \
        iface.o \
        rate.o \
        michael.o \
@@ -25,7 +25,7 @@ mac80211-y := \
        wme.o \
        event.o \
        chan.o \
-        driver-trace.o
+        driver-trace.o mlme.o
 mac80211-$(CONFIG_MAC80211_LEDS) += led.o
 mac80211-$(CONFIG_MAC80211_DEBUGFS) += \
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 296620d6ca0c..677d65929780 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -336,6 +336,20 @@ static void rate_idx_to_bitrate(struct rate_info *rate, struct sta_info *sta, in
                rate->mcs = idx;
 }
+void sta_set_rate_info_tx(struct sta_info *sta,
+                          const struct ieee80211_tx_rate *rate,
+                          struct rate_info *rinfo)
+{
+        rinfo->flags = 0;
+        if (rate->flags & IEEE80211_TX_RC_MCS)
+                rinfo->flags |= RATE_INFO_FLAGS_MCS;
+        if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
+                rinfo->flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
+        if (rate->flags & IEEE80211_TX_RC_SHORT_GI)
+                rinfo->flags |= RATE_INFO_FLAGS_SHORT_GI;
+        rate_idx_to_bitrate(rinfo, sta, rate->idx);
+}
 static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
 {
        struct ieee80211_sub_if_data *sdata = sta->sdata;
@@ -378,14 +392,7 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
                sinfo->signal_avg = (s8) -ewma_read(&sta->avg_signal);
        }
-        sinfo->txrate.flags = 0;
+        sta_set_rate_info_tx(sta, &sta->last_tx_rate, &sinfo->txrate);
-        if (sta->last_tx_rate.flags & IEEE80211_TX_RC_MCS)
-                sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS;
-        if (sta->last_tx_rate.flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
-                sinfo->txrate.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
-        if (sta->last_tx_rate.flags & IEEE80211_TX_RC_SHORT_GI)
-                sinfo->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
-        rate_idx_to_bitrate(&sinfo->txrate, sta, sta->last_tx_rate.idx);
        sinfo->rxrate.flags = 0;
        if (sta->last_rx_rate_flag & RX_FLAG_HT)
@@ -489,27 +496,13 @@ static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev,
        return ret;
 }
-static void ieee80211_config_ap_ssid(struct ieee80211_sub_if_data *sdata,
-                                     struct beacon_parameters *params)
-{
-        struct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf;
-        bss_conf->ssid_len = params->ssid_len;
-        if (params->ssid_len)
-                memcpy(bss_conf->ssid, params->ssid, params->ssid_len);
-        bss_conf->hidden_ssid =
-                (params->hidden_ssid != NL80211_HIDDEN_SSID_NOT_IN_USE);
-}
 static int ieee80211_set_probe_resp(struct ieee80211_sub_if_data *sdata,
-                                    u8 *resp, size_t resp_len)
+                                    const u8 *resp, size_t resp_len)
 {
        struct sk_buff *new, *old;
        if (!resp || !resp_len)
-                return -EINVAL;
+                return 1;
        old = rtnl_dereference(sdata->u.ap.probe_resp);
@@ -520,50 +513,28 @@ static int ieee80211_set_probe_resp(struct ieee80211_sub_if_data *sdata,
        memcpy(skb_put(new, resp_len), resp, resp_len);
        rcu_assign_pointer(sdata->u.ap.probe_resp, new);
-        synchronize_rcu();
+        if (old) {
+                /* TODO: use call_rcu() */
-        if (old)
+                synchronize_rcu();
                dev_kfree_skb(old);
+        }
        return 0;
 }
-/*
+static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,
- * This handles both adding a beacon and setting new beacon info
+                                   struct cfg80211_beacon_data *params)
- */
-static int ieee80211_config_beacon(struct ieee80211_sub_if_data *sdata,
-                                   struct beacon_parameters *params)
 {
        struct beacon_data *new, *old;
        int new_head_len, new_tail_len;
-        int size;
+        int size, err;
-        int err = -EINVAL;
+        u32 changed = BSS_CHANGED_BEACON;
-        u32 changed = 0;
        old = rtnl_dereference(sdata->u.ap.beacon);
-        /* head must not be zero-length */
-        if (params->head && !params->head_len)
-                return -EINVAL;
-        /*
-         * This is a kludge. beacon interval should really be part
-         * of the beacon information.
-         */
-        if (params->interval &&
-            (sdata->vif.bss_conf.beacon_int != params->interval)) {
-                sdata->vif.bss_conf.beacon_int = params->interval;
-                ieee80211_bss_info_change_notify(sdata,
-                                                 BSS_CHANGED_BEACON_INT);
-        }
        /* Need to have a beacon head if we don't have one yet */
        if (!params->head && !old)
-                return err;
+                return -EINVAL;
-        /* sorry, no way to start beaconing without dtim period */
-        if (!params->dtim_period && !old)
-                return err;
        /* new or old head? */
        if (params->head)
@@ -586,12 +557,6 @@ static int ieee80211_config_beacon(struct ieee80211_sub_if_data *sdata,
        /* start filling the new info now */
-        /* new or old dtim period? */
-        if (params->dtim_period)
-                new->dtim_period = params->dtim_period;
-        else
-                new->dtim_period = old->dtim_period;
        /*
         * pointers go into the block we allocated,
         * memory is | beacon_data | head | tail |
@@ -614,46 +579,37 @@ static int ieee80211_config_beacon(struct ieee80211_sub_if_data *sdata,
                if (old)
                        memcpy(new->tail, old->tail, new_tail_len);
-        sdata->vif.bss_conf.dtim_period = new->dtim_period;
-        rcu_assign_pointer(sdata->u.ap.beacon, new);
-        synchronize_rcu();
-        kfree(old);
        err = ieee80211_set_probe_resp(sdata, params->probe_resp,
                                       params->probe_resp_len);
-        if (!err)
+        if (err < 0)
+                return err;
+        if (err == 0)
                changed |= BSS_CHANGED_AP_PROBE_RESP;
-        ieee80211_config_ap_ssid(sdata, params);
+        rcu_assign_pointer(sdata->u.ap.beacon, new);
-        changed |= BSS_CHANGED_BEACON_ENABLED |
-                   BSS_CHANGED_BEACON |
-                   BSS_CHANGED_SSID;
-        ieee80211_bss_info_change_notify(sdata, changed);
+        if (old)
-        return 0;
+                kfree_rcu(old, rcu_head);
+        return changed;
 }
-static int ieee80211_add_beacon(struct wiphy *wiphy, struct net_device *dev,
+static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
-                                struct beacon_parameters *params)
+                              struct cfg80211_ap_settings *params)
 {
-        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
        struct beacon_data *old;
        struct ieee80211_sub_if_data *vlan;
-        int ret;
+        u32 changed = BSS_CHANGED_BEACON_INT |
+                      BSS_CHANGED_BEACON_ENABLED |
-        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+                      BSS_CHANGED_BEACON |
+                      BSS_CHANGED_SSID;
+        int err;
        old = rtnl_dereference(sdata->u.ap.beacon);
        if (old)
                return -EALREADY;
-        ret = ieee80211_config_beacon(sdata, params);
-        if (ret)
-                return ret;
        /*
         * Apply control port protocol, this allows us to
         * not encrypt dynamic WEP control frames.
@@ -667,14 +623,32 @@ static int ieee80211_add_beacon(struct wiphy *wiphy, struct net_device *dev,
                        params->crypto.control_port_no_encrypt;
        }
+        sdata->vif.bss_conf.beacon_int = params->beacon_interval;
+        sdata->vif.bss_conf.dtim_period = params->dtim_period;
+        sdata->vif.bss_conf.ssid_len = params->ssid_len;
+        if (params->ssid_len)
+                memcpy(sdata->vif.bss_conf.ssid, params->ssid,
+                       params->ssid_len);
+        sdata->vif.bss_conf.hidden_ssid =
+                (params->hidden_ssid != NL80211_HIDDEN_SSID_NOT_IN_USE);
+        err = ieee80211_assign_beacon(sdata, &params->beacon);
+        if (err < 0)
+                return err;
+        changed |= err;
+        ieee80211_bss_info_change_notify(sdata, changed);
        return 0;
 }
-static int ieee80211_set_beacon(struct wiphy *wiphy, struct net_device *dev,
+static int ieee80211_change_beacon(struct wiphy *wiphy, struct net_device *dev,
-                                struct beacon_parameters *params)
+                                   struct cfg80211_beacon_data *params)
 {
        struct ieee80211_sub_if_data *sdata;
        struct beacon_data *old;
+        int err;
        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
@@ -682,10 +656,14 @@ static int ieee80211_set_beacon(struct wiphy *wiphy, struct net_device *dev,
        if (!old)
                return -ENOENT;
-        return ieee80211_config_beacon(sdata, params);
+        err = ieee80211_assign_beacon(sdata, params);
+        if (err < 0)
+                return err;
+        ieee80211_bss_info_change_notify(sdata, err);
+        return 0;
 }
-static int ieee80211_del_beacon(struct wiphy *wiphy, struct net_device *dev)
+static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
 {
        struct ieee80211_sub_if_data *sdata;
        struct beacon_data *old;
@@ -697,10 +675,11 @@ static int ieee80211_del_beacon(struct wiphy *wiphy, struct net_device *dev)
                return -ENOENT;
        RCU_INIT_POINTER(sdata->u.ap.beacon, NULL);
-        synchronize_rcu();
-        kfree(old);
+        kfree_rcu(old, rcu_head);
        ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
        return 0;
 }
@@ -776,12 +755,10 @@ static int sta_apply_parameters(struct ieee80211_local *local,
                if (set & BIT(NL80211_STA_FLAG_AUTHENTICATED) &&
                    !test_sta_flag(sta, WLAN_STA_AUTH)) {
-                        ret = sta_info_move_state_checked(sta,
+                        ret = sta_info_move_state(sta, IEEE80211_STA_AUTH);
-                                        IEEE80211_STA_AUTH);
                        if (ret)
                                return ret;
-                        ret = sta_info_move_state_checked(sta,
+                        ret = sta_info_move_state(sta, IEEE80211_STA_ASSOC);
-                                        IEEE80211_STA_ASSOC);
                        if (ret)
                                return ret;
                }
@@ -789,11 +766,9 @@ static int sta_apply_parameters(struct ieee80211_local *local,
        if (mask & BIT(NL80211_STA_FLAG_AUTHORIZED)) {
                if (set & BIT(NL80211_STA_FLAG_AUTHORIZED))
-                        ret = sta_info_move_state_checked(sta,
+                        ret = sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
-                                        IEEE80211_STA_AUTHORIZED);
                else if (test_sta_flag(sta, WLAN_STA_AUTHORIZED))
-                        ret = sta_info_move_state_checked(sta,
+                        ret = sta_info_move_state(sta, IEEE80211_STA_ASSOC);
-                                        IEEE80211_STA_ASSOC);
                if (ret)
                        return ret;
        }
@@ -805,12 +780,10 @@ static int sta_apply_parameters(struct ieee80211_local *local,
                if (!(set & BIT(NL80211_STA_FLAG_AUTHENTICATED)) &&
                    test_sta_flag(sta, WLAN_STA_AUTH)) {
-                        ret = sta_info_move_state_checked(sta,
+                        ret = sta_info_move_state(sta, IEEE80211_STA_AUTH);
-                                        IEEE80211_STA_AUTH);
                        if (ret)
                                return ret;
-                        ret = sta_info_move_state_checked(sta,
+                        ret = sta_info_move_state(sta, IEEE80211_STA_NONE);
-                                        IEEE80211_STA_NONE);
                        if (ret)
                                return ret;
                }
@@ -944,8 +917,8 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
        if (!sta)
                return -ENOMEM;
-        sta_info_move_state(sta, IEEE80211_STA_AUTH);
+        sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
-        sta_info_move_state(sta, IEEE80211_STA_ASSOC);
+        sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
        err = sta_apply_parameters(local, sta, params);
        if (err) {
@@ -1001,6 +974,7 @@ static int ieee80211_change_station(struct wiphy *wiphy,
        struct ieee80211_local *local = wiphy_priv(wiphy);
        struct sta_info *sta;
        struct ieee80211_sub_if_data *vlansdata;
+        int err;
        mutex_lock(&local->sta_mtx);
@@ -1040,7 +1014,11 @@ static int ieee80211_change_station(struct wiphy *wiphy,
                ieee80211_send_layer2_update(sta);
        }
-        sta_apply_parameters(local, sta, params);
+        err = sta_apply_parameters(local, sta, params);
+        if (err) {
+                mutex_unlock(&local->sta_mtx);
+                return err;
+        }
        if (test_sta_flag(sta, WLAN_STA_TDLS_PEER) && params->supported_rates)
                rate_control_rate_init(sta);
@@ -1341,6 +1319,16 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
                conf->dot11MeshHWMPRannInterval =
                        nconf->dot11MeshHWMPRannInterval;
        }
+        if (_chg_mesh_attr(NL80211_MESHCONF_FORWARDING, mask))
+                conf->dot11MeshForwarding = nconf->dot11MeshForwarding;
+        if (_chg_mesh_attr(NL80211_MESHCONF_RSSI_THRESHOLD, mask)) {
+                /* our RSSI threshold implementation is supported only for
+                 * devices that report signal in dBm.
+                 */
+                if (!(sdata->local->hw.flags & IEEE80211_HW_SIGNAL_DBM))
+                        return -ENOTSUPP;
+                conf->rssi_threshold = nconf->rssi_threshold;
+        }
        return 0;
 }
@@ -1622,19 +1610,15 @@ static int ieee80211_assoc(struct wiphy *wiphy, struct net_device *dev,
 }
 static int ieee80211_deauth(struct wiphy *wiphy, struct net_device *dev,
-                            struct cfg80211_deauth_request *req,
+                            struct cfg80211_deauth_request *req)
-                            void *cookie)
 {
-        return ieee80211_mgd_deauth(IEEE80211_DEV_TO_SUB_IF(dev),
+        return ieee80211_mgd_deauth(IEEE80211_DEV_TO_SUB_IF(dev), req);
-                                    req, cookie);
 }
 static int ieee80211_disassoc(struct wiphy *wiphy, struct net_device *dev,
-                              struct cfg80211_disassoc_request *req,
+                              struct cfg80211_disassoc_request *req)
-                              void *cookie)
 {
-        return ieee80211_mgd_disassoc(IEEE80211_DEV_TO_SUB_IF(dev),
+        return ieee80211_mgd_disassoc(IEEE80211_DEV_TO_SUB_IF(dev), req);
-                                      req, cookie);
 }
 static int ieee80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
@@ -1868,7 +1852,6 @@ static int ieee80211_set_cqm_rssi_config(struct wiphy *wiphy,
                                         s32 rssi_thold, u32 rssi_hyst)
 {
        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
        struct ieee80211_vif *vif = &sdata->vif;
        struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
@@ -1879,14 +1862,9 @@ static int ieee80211_set_cqm_rssi_config(struct wiphy *wiphy,
        bss_conf->cqm_rssi_thold = rssi_thold;
        bss_conf->cqm_rssi_hyst = rssi_hyst;
-        if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_CQM_RSSI)) {
-                if (sdata->vif.type != NL80211_IFTYPE_STATION)
-                        return -EOPNOTSUPP;
-                return 0;
-        }
        /* tell the driver upon association, unless already associated */
-        if (sdata->u.mgd.associated)
+        if (sdata->u.mgd.associated &&
+            sdata->vif.driver_flags & IEEE80211_VIF_SUPPORTS_CQM_RSSI)
                ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_CQM);
        return 0;
@@ -1907,8 +1885,11 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy,
                        return ret;
        }
-        for (i = 0; i < IEEE80211_NUM_BANDS; i++)
+        for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
                sdata->rc_rateidx_mask[i] = mask->control[i].legacy;
+                memcpy(sdata->rc_rateidx_mcs_mask[i], mask->control[i].mcs,
+                       sizeof(mask->control[i].mcs));
+        }
        return 0;
 }
@@ -2030,7 +2011,7 @@ ieee80211_offchan_tx_done(struct ieee80211_work *wk, struct sk_buff *skb)
        if (wk->offchan_tx.wait && !wk->offchan_tx.status)
                cfg80211_mgmt_tx_status(wk->sdata->dev,
                                        (unsigned long) wk->offchan_tx.frame,
-                                        wk->ie, wk->ie_len, false, GFP_KERNEL);
+                                        wk->data, wk->data_len, false, GFP_KERNEL);
        return WORK_DONE_DESTROY;
 }
@@ -2181,8 +2162,8 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
        wk->done = ieee80211_offchan_tx_done;
        wk->offchan_tx.frame = skb;
        wk->offchan_tx.wait = wait;
-        wk->ie_len = len;
+        wk->data_len = len;
-        memcpy(wk->ie, buf, len);
+        memcpy(wk->data, buf, len);
        ieee80211_add_work(wk);
        return 0;
@@ -2701,9 +2682,9 @@ struct cfg80211_ops mac80211_config_ops = {
        .get_key = ieee80211_get_key,
        .set_default_key = ieee80211_config_default_key,
        .set_default_mgmt_key = ieee80211_config_default_mgmt_key,
-        .add_beacon = ieee80211_add_beacon,
+        .start_ap = ieee80211_start_ap,
-        .set_beacon = ieee80211_set_beacon,
+        .change_beacon = ieee80211_change_beacon,
-        .del_beacon = ieee80211_del_beacon,
+        .stop_ap = ieee80211_stop_ap,
        .add_station = ieee80211_add_station,
        .del_station = ieee80211_del_station,
        .change_station = ieee80211_change_station,
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 889c3e93e0f4..e00ce8c3e28e 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -3,6 +3,7 @@
 */
 #include <linux/nl80211.h>
+#include <net/cfg80211.h>
 #include "ieee80211_i.h"
 static enum ieee80211_chan_mode
@@ -20,23 +21,29 @@ __ieee80211_get_channel_mode(struct ieee80211_local *local,
                if (!ieee80211_sdata_running(sdata))
                        continue;
-                if (sdata->vif.type == NL80211_IFTYPE_MONITOR)
+                switch (sdata->vif.type) {
+                case NL80211_IFTYPE_MONITOR:
                        continue;
+                case NL80211_IFTYPE_STATION:
-                if (sdata->vif.type == NL80211_IFTYPE_STATION &&
+                        if (!sdata->u.mgd.associated)
-                    !sdata->u.mgd.associated)
+                                continue;
-                        continue;
+                        break;
+                case NL80211_IFTYPE_ADHOC:
-                if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
                        if (!sdata->u.ibss.ssid_len)
                                continue;
                        if (!sdata->u.ibss.fixed_channel)
                                return CHAN_MODE_HOPPING;
-                }
+                        break;
+                case NL80211_IFTYPE_AP_VLAN:
-                if (sdata->vif.type == NL80211_IFTYPE_AP &&
+                        /* will also have _AP interface */
-                    !sdata->u.ap.beacon)
                        continue;
+                case NL80211_IFTYPE_AP:
+                        if (!sdata->u.ap.beacon)
+                                continue;
+                        break;
+                default:
+                        break;
+                }
                return CHAN_MODE_FIXED;
        }
@@ -128,3 +135,29 @@ bool ieee80211_set_channel_type(struct ieee80211_local *local,
        return result;
 }
+/*
+ * ieee80211_get_tx_channel_type returns the channel type we should
+ * use for packet transmission, given the channel capability and
+ * whatever regulatory flags we have been given.
+ */
+enum nl80211_channel_type ieee80211_get_tx_channel_type(
+                                struct ieee80211_local *local,
+                                enum nl80211_channel_type channel_type)
+{
+        switch (channel_type) {
+        case NL80211_CHAN_HT40PLUS:
+                if (local->hw.conf.channel->flags &
+                                IEEE80211_CHAN_NO_HT40PLUS)
+                        return NL80211_CHAN_HT20;
+                break;
+        case NL80211_CHAN_HT40MINUS:
+                if (local->hw.conf.channel->flags &
+                                IEEE80211_CHAN_NO_HT40MINUS)
+                        return NL80211_CHAN_HT20;
+                break;
+        default:
+                break;
+        }
+        return channel_type;
+}
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index 90baea53e7c5..cc5b7a6e7e0b 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -97,85 +97,6 @@ static const struct file_operations reset_ops = {
        .llseek = noop_llseek,
 };
-static ssize_t uapsd_queues_read(struct file *file, char __user *user_buf,
-                                 size_t count, loff_t *ppos)
-{
-        struct ieee80211_local *local = file->private_data;
-        return mac80211_format_buffer(user_buf, count, ppos, "0x%x\n",
-                                      local->uapsd_queues);
-}
-static ssize_t uapsd_queues_write(struct file *file,
-                                  const char __user *user_buf,
-                                  size_t count, loff_t *ppos)
-{
-        struct ieee80211_local *local = file->private_data;
-        u8 val;
-        int ret;
-        ret = kstrtou8_from_user(user_buf, count, 0, &val);
-        if (ret)
-                return ret;
-        if (val & ~IEEE80211_WMM_IE_STA_QOSINFO_AC_MASK)
-                return -ERANGE;
-        local->uapsd_queues = val;
-        return count;
-}
-static const struct file_operations uapsd_queues_ops = {
-        .read = uapsd_queues_read,
-        .write = uapsd_queues_write,
-        .open = mac80211_open_file_generic,
-        .llseek = default_llseek,
-};
-static ssize_t uapsd_max_sp_len_read(struct file *file, char __user *user_buf,
-                                     size_t count, loff_t *ppos)
-{
-        struct ieee80211_local *local = file->private_data;
-        return mac80211_format_buffer(user_buf, count, ppos, "0x%x\n",
-                                      local->uapsd_max_sp_len);
-}
-static ssize_t uapsd_max_sp_len_write(struct file *file,
-                                      const char __user *user_buf,
-                                      size_t count, loff_t *ppos)
-{
-        struct ieee80211_local *local = file->private_data;
-        unsigned long val;
-        char buf[10];
-        size_t len;
-        int ret;
-        len = min(count, sizeof(buf) - 1);
-        if (copy_from_user(buf, user_buf, len))
-                return -EFAULT;
-        buf[len] = '\0';
-        ret = kstrtoul(buf, 0, &val);
-        if (ret)
-                return -EINVAL;
-        if (val & ~IEEE80211_WMM_IE_STA_QOSINFO_SP_MASK)
-                return -ERANGE;
-        local->uapsd_max_sp_len = val;
-        return count;
-}
-static const struct file_operations uapsd_max_sp_len_ops = {
-        .read = uapsd_max_sp_len_read,
-        .write = uapsd_max_sp_len_write,
-        .open = mac80211_open_file_generic,
-        .llseek = default_llseek,
-};
 static ssize_t channel_type_read(struct file *file, char __user *user_buf,
                       size_t count, loff_t *ppos)
 {
@@ -247,8 +168,6 @@ static ssize_t hwflags_read(struct file *file, char __user *user_buf,
                sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_DYNAMIC_PS\n");
        if (local->hw.flags & IEEE80211_HW_MFP_CAPABLE)
                sf += snprintf(buf + sf, mxln - sf, "MFP_CAPABLE\n");
-        if (local->hw.flags & IEEE80211_HW_BEACON_FILTER)
-                sf += snprintf(buf + sf, mxln - sf, "BEACON_FILTER\n");
        if (local->hw.flags & IEEE80211_HW_SUPPORTS_STATIC_SMPS)
                sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_STATIC_SMPS\n");
        if (local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS)
@@ -259,14 +178,14 @@ static ssize_t hwflags_read(struct file *file, char __user *user_buf,
                sf += snprintf(buf + sf, mxln - sf, "REPORTS_TX_ACK_STATUS\n");
        if (local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR)
                sf += snprintf(buf + sf, mxln - sf, "CONNECTION_MONITOR\n");
-        if (local->hw.flags & IEEE80211_HW_SUPPORTS_CQM_RSSI)
-                sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_CQM_RSSI\n");
        if (local->hw.flags & IEEE80211_HW_SUPPORTS_PER_STA_GTK)
                sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_PER_STA_GTK\n");
        if (local->hw.flags & IEEE80211_HW_AP_LINK_PS)
                sf += snprintf(buf + sf, mxln - sf, "AP_LINK_PS\n");
        if (local->hw.flags & IEEE80211_HW_TX_AMPDU_SETUP_IN_HW)
                sf += snprintf(buf + sf, mxln - sf, "TX_AMPDU_SETUP_IN_HW\n");
+        if (local->hw.flags & IEEE80211_HW_SCAN_WHILE_IDLE)
+                sf += snprintf(buf + sf, mxln - sf, "SCAN_WHILE_IDLE\n");
        rv = simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf));
        kfree(buf);
@@ -364,8 +283,6 @@ void debugfs_hw_add(struct ieee80211_local *local)
        DEBUGFS_ADD(wep_iv);
        DEBUGFS_ADD(queues);
        DEBUGFS_ADD_MODE(reset, 0200);
-        DEBUGFS_ADD(uapsd_queues);
-        DEBUGFS_ADD(uapsd_max_sp_len);
        DEBUGFS_ADD(channel_type);
        DEBUGFS_ADD(hwflags);
        DEBUGFS_ADD(user_power);
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index 176c08ffb13c..a32eeda04aa3 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -49,16 +49,15 @@ static ssize_t ieee80211_if_write(
        size_t count, loff_t *ppos,
        ssize_t (*write)(struct ieee80211_sub_if_data *, const char *, int))
 {
-        u8 *buf;
+        char buf[64];
        ssize_t ret;
-        buf = kmalloc(count, GFP_KERNEL);
+        if (count >= sizeof(buf))
-        if (!buf)
+                return -E2BIG;
-                return -ENOMEM;
-        ret = -EFAULT;
        if (copy_from_user(buf, userbuf, count))
-                goto freebuf;
+                return -EFAULT;
+        buf[count] = '\0';
        ret = -ENODEV;
        rtnl_lock();
@@ -66,8 +65,6 @@ static ssize_t ieee80211_if_write(
                ret = (*write)(sdata, buf, count);
        rtnl_unlock();
-freebuf:
-        kfree(buf);
        return ret;
 }
@@ -87,6 +84,21 @@ static ssize_t ieee80211_if_fmt_##name(					\
 #define IEEE80211_IF_FMT_SIZE(name, field)                              \
                IEEE80211_IF_FMT(name, field, "%zd\n")
+#define IEEE80211_IF_FMT_HEXARRAY(name, field)                          \
+static ssize_t ieee80211_if_fmt_##name(                                 \
+        const struct ieee80211_sub_if_data *sdata,                      \
+        char *buf, int buflen)                                          \
+{                                                                       \
+        char *p = buf;                                                  \
+        int i;                                                          \
+        for (i = 0; i < sizeof(sdata->field); i++) {                    \
+                p += scnprintf(p, buflen + buf - p, "%.2x ",            \
+                                 sdata->field[i]);                      \
+        }                                                               \
+        p += scnprintf(p, buflen + buf - p, "\n");                      \
+        return p - buf;                                                 \
+}
 #define IEEE80211_IF_FMT_ATOMIC(name, field)                            \
 static ssize_t ieee80211_if_fmt_##name(                                 \
        const struct ieee80211_sub_if_data *sdata,                      \
@@ -148,6 +160,11 @@ IEEE80211_IF_FILE(rc_rateidx_mask_2ghz, rc_rateidx_mask[IEEE80211_BAND_2GHZ],
                  HEX);
 IEEE80211_IF_FILE(rc_rateidx_mask_5ghz, rc_rateidx_mask[IEEE80211_BAND_5GHZ],
                  HEX);
+IEEE80211_IF_FILE(rc_rateidx_mcs_mask_2ghz,
+                  rc_rateidx_mcs_mask[IEEE80211_BAND_2GHZ], HEXARRAY);
+IEEE80211_IF_FILE(rc_rateidx_mcs_mask_5ghz,
+                  rc_rateidx_mcs_mask[IEEE80211_BAND_5GHZ], HEXARRAY);
 IEEE80211_IF_FILE(flags, flags, HEX);
 IEEE80211_IF_FILE(state, state, LHEX);
 IEEE80211_IF_FILE(channel_type, vif.bss_conf.channel_type, DEC);
@@ -320,6 +337,62 @@ static ssize_t ieee80211_if_parse_tkip_mic_test(
 __IEEE80211_IF_FILE_W(tkip_mic_test);
+static ssize_t ieee80211_if_fmt_uapsd_queues(
+        const struct ieee80211_sub_if_data *sdata, char *buf, int buflen)
+{
+        const struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+        return snprintf(buf, buflen, "0x%x\n", ifmgd->uapsd_queues);
+}
+static ssize_t ieee80211_if_parse_uapsd_queues(
+        struct ieee80211_sub_if_data *sdata, const char *buf, int buflen)
+{
+        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+        u8 val;
+        int ret;
+        ret = kstrtou8(buf, 0, &val);
+        if (ret)
+                return ret;
+        if (val & ~IEEE80211_WMM_IE_STA_QOSINFO_AC_MASK)
+                return -ERANGE;
+        ifmgd->uapsd_queues = val;
+        return buflen;
+}
+__IEEE80211_IF_FILE_W(uapsd_queues);
+static ssize_t ieee80211_if_fmt_uapsd_max_sp_len(
+        const struct ieee80211_sub_if_data *sdata, char *buf, int buflen)
+{
+        const struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+        return snprintf(buf, buflen, "0x%x\n", ifmgd->uapsd_max_sp_len);
+}
+static ssize_t ieee80211_if_parse_uapsd_max_sp_len(
+        struct ieee80211_sub_if_data *sdata, const char *buf, int buflen)
+{
+        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+        unsigned long val;
+        int ret;
+        ret = kstrtoul(buf, 0, &val);
+        if (ret)
+                return -EINVAL;
+        if (val & ~IEEE80211_WMM_IE_STA_QOSINFO_SP_MASK)
+                return -ERANGE;
+        ifmgd->uapsd_max_sp_len = val;
+        return buflen;
+}
+__IEEE80211_IF_FILE_W(uapsd_max_sp_len);
 /* AP attributes */
 IEEE80211_IF_FILE(num_sta_authorized, u.ap.num_sta_authorized, ATOMIC);
 IEEE80211_IF_FILE(num_sta_ps, u.ap.num_sta_ps, ATOMIC);
@@ -422,6 +495,8 @@ IEEE80211_IF_FILE(dot11MeshGateAnnouncementProtocol,
                u.mesh.mshcfg.dot11MeshGateAnnouncementProtocol, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPRannInterval,
                u.mesh.mshcfg.dot11MeshHWMPRannInterval, DEC);
+IEEE80211_IF_FILE(dot11MeshForwarding, u.mesh.mshcfg.dot11MeshForwarding, DEC);
+IEEE80211_IF_FILE(rssi_threshold, u.mesh.mshcfg.rssi_threshold, DEC);
 #endif
@@ -441,6 +516,8 @@ static void add_sta_files(struct ieee80211_sub_if_data *sdata)
        DEBUGFS_ADD(channel_type);
        DEBUGFS_ADD(rc_rateidx_mask_2ghz);
        DEBUGFS_ADD(rc_rateidx_mask_5ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
        DEBUGFS_ADD(bssid);
        DEBUGFS_ADD(aid);
@@ -448,6 +525,8 @@ static void add_sta_files(struct ieee80211_sub_if_data *sdata)
        DEBUGFS_ADD(ave_beacon);
        DEBUGFS_ADD_MODE(smps, 0600);
        DEBUGFS_ADD_MODE(tkip_mic_test, 0200);
+        DEBUGFS_ADD_MODE(uapsd_queues, 0600);
+        DEBUGFS_ADD_MODE(uapsd_max_sp_len, 0600);
 }
 static void add_ap_files(struct ieee80211_sub_if_data *sdata)
@@ -458,6 +537,8 @@ static void add_ap_files(struct ieee80211_sub_if_data *sdata)
        DEBUGFS_ADD(channel_type);
        DEBUGFS_ADD(rc_rateidx_mask_2ghz);
        DEBUGFS_ADD(rc_rateidx_mask_5ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
        DEBUGFS_ADD(num_sta_authorized);
        DEBUGFS_ADD(num_sta_ps);
@@ -468,6 +549,12 @@ static void add_ap_files(struct ieee80211_sub_if_data *sdata)
 static void add_ibss_files(struct ieee80211_sub_if_data *sdata)
 {
+        DEBUGFS_ADD(channel_type);
+        DEBUGFS_ADD(rc_rateidx_mask_2ghz);
+        DEBUGFS_ADD(rc_rateidx_mask_5ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
        DEBUGFS_ADD_MODE(tsf, 0600);
 }
@@ -479,6 +566,8 @@ static void add_wds_files(struct ieee80211_sub_if_data *sdata)
        DEBUGFS_ADD(channel_type);
        DEBUGFS_ADD(rc_rateidx_mask_2ghz);
        DEBUGFS_ADD(rc_rateidx_mask_5ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
        DEBUGFS_ADD(peer);
 }
@@ -491,6 +580,8 @@ static void add_vlan_files(struct ieee80211_sub_if_data *sdata)
        DEBUGFS_ADD(channel_type);
        DEBUGFS_ADD(rc_rateidx_mask_2ghz);
        DEBUGFS_ADD(rc_rateidx_mask_5ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
 }
 static void add_monitor_files(struct ieee80211_sub_if_data *sdata)
@@ -502,11 +593,15 @@ static void add_monitor_files(struct ieee80211_sub_if_data *sdata)
 #ifdef CONFIG_MAC80211_MESH
+static void add_mesh_files(struct ieee80211_sub_if_data *sdata)
+{
+        DEBUGFS_ADD_MODE(tsf, 0600);
+}
 static void add_mesh_stats(struct ieee80211_sub_if_data *sdata)
 {
        struct dentry *dir = debugfs_create_dir("mesh_stats",
                                                sdata->debugfs.dir);
 #define MESHSTATS_ADD(name)\
        debugfs_create_file(#name, 0400, dir, sdata, &name##_ops);
@@ -546,6 +641,7 @@ static void add_mesh_config(struct ieee80211_sub_if_data *sdata)
        MESHPARAMS_ADD(dot11MeshHWMPRootMode);
        MESHPARAMS_ADD(dot11MeshHWMPRannInterval);
        MESHPARAMS_ADD(dot11MeshGateAnnouncementProtocol);
+        MESHPARAMS_ADD(rssi_threshold);
 #undef MESHPARAMS_ADD
 }
 #endif
@@ -558,6 +654,7 @@ static void add_files(struct ieee80211_sub_if_data *sdata)
        switch (sdata->vif.type) {
        case NL80211_IFTYPE_MESH_POINT:
 #ifdef CONFIG_MAC80211_MESH
+                add_mesh_files(sdata);
                add_mesh_stats(sdata);
                add_mesh_config(sdata);
 #endif
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index d86217d56bd7..6d45804d09bc 100644
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -63,14 +63,15 @@ static ssize_t sta_flags_read(struct file *file, char __user *userbuf,
        test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
        int res = scnprintf(buf, sizeof(buf),
-                            "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+                            "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
                            TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
                            TEST(PS_DRIVER), TEST(AUTHORIZED),
                            TEST(SHORT_PREAMBLE),
                            TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
                            TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
                            TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
-                            TEST(TDLS_PEER_AUTH), TEST(RATE_CONTROL));
+                            TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
+                            TEST(INSERTED), TEST(RATE_CONTROL));
 #undef TEST
        return simple_read_from_buffer(userbuf, count, ppos, buf, res);
 }
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index e8960ae39861..af4691fed645 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -168,41 +168,6 @@ static inline void drv_bss_info_changed(struct ieee80211_local *local,
        trace_drv_return_void(local);
 }
-static inline int drv_tx_sync(struct ieee80211_local *local,
-                              struct ieee80211_sub_if_data *sdata,
-                              const u8 *bssid,
-                              enum ieee80211_tx_sync_type type)
-{
-        int ret = 0;
-        might_sleep();
-        check_sdata_in_driver(sdata);
-        trace_drv_tx_sync(local, sdata, bssid, type);
-        if (local->ops->tx_sync)
-                ret = local->ops->tx_sync(&local->hw, &sdata->vif,
-                                          bssid, type);
-        trace_drv_return_int(local, ret);
-        return ret;
-}
-static inline void drv_finish_tx_sync(struct ieee80211_local *local,
-                                      struct ieee80211_sub_if_data *sdata,
-                                      const u8 *bssid,
-                                      enum ieee80211_tx_sync_type type)
-{
-        might_sleep();
-        check_sdata_in_driver(sdata);
-        trace_drv_finish_tx_sync(local, sdata, bssid, type);
-        if (local->ops->finish_tx_sync)
-                local->ops->finish_tx_sync(&local->hw, &sdata->vif,
-                                           bssid, type);
-        trace_drv_return_void(local);
-}
 static inline u64 drv_prepare_multicast(struct ieee80211_local *local,
                                        struct netdev_hw_addr_list *mc_list)
 {
@@ -253,6 +218,7 @@ static inline int drv_set_key(struct ieee80211_local *local,
        might_sleep();
+        sdata = get_bss_sdata(sdata);
        check_sdata_in_driver(sdata);
        trace_drv_set_key(local, cmd, sdata, sta, key);
@@ -272,6 +238,7 @@ static inline void drv_update_tkip_key(struct ieee80211_local *local,
        if (sta)
                ista = &sta->sta;
+        sdata = get_bss_sdata(sdata);
        check_sdata_in_driver(sdata);
        trace_drv_update_tkip_key(local, sdata, conf, ista, iv32);
@@ -476,6 +443,37 @@ static inline void drv_sta_remove(struct ieee80211_local *local,
        trace_drv_return_void(local);
 }
+static inline __must_check
+int drv_sta_state(struct ieee80211_local *local,
+                  struct ieee80211_sub_if_data *sdata,
+                  struct sta_info *sta,
+                  enum ieee80211_sta_state old_state,
+                  enum ieee80211_sta_state new_state)
+{
+        int ret = 0;
+        might_sleep();
+        sdata = get_bss_sdata(sdata);
+        check_sdata_in_driver(sdata);
+        trace_drv_sta_state(local, sdata, &sta->sta, old_state, new_state);
+        if (local->ops->sta_state) {
+                ret = local->ops->sta_state(&local->hw, &sdata->vif, &sta->sta,
+                                            old_state, new_state);
+        } else if (old_state == IEEE80211_STA_AUTH &&
+                   new_state == IEEE80211_STA_ASSOC) {
+                ret = drv_sta_add(local, sdata, &sta->sta);
+                if (ret == 0)
+                        sta->uploaded = true;
+        } else if (old_state == IEEE80211_STA_ASSOC &&
+                   new_state == IEEE80211_STA_AUTH) {
+                drv_sta_remove(local, sdata, &sta->sta);
+        }
+        trace_drv_return_int(local, ret);
+        return ret;
+}
 static inline int drv_conf_tx(struct ieee80211_local *local,
                              struct ieee80211_sub_if_data *sdata, u16 queue,
                              const struct ieee80211_tx_queue_params *params)
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h
index 6e9df8fd8fb8..21d6f5290a1c 100644
--- a/net/mac80211/driver-trace.h
+++ b/net/mac80211/driver-trace.h
@@ -296,7 +296,7 @@ TRACE_EVENT(drv_bss_info_changed,
                __entry->dtimper = info->dtim_period;
                __entry->bcnint = info->beacon_int;
                __entry->assoc_cap = info->assoc_capability;
-                __entry->timestamp = info->timestamp;
+                __entry->timestamp = info->last_tsf;
                __entry->basic_rates = info->basic_rates;
                __entry->enable_beacon = info->enable_beacon;
                __entry->ht_operation_mode = info->ht_operation_mode;
@@ -308,49 +308,6 @@ TRACE_EVENT(drv_bss_info_changed,
        )
 );
-DECLARE_EVENT_CLASS(tx_sync_evt,
-        TP_PROTO(struct ieee80211_local *local,
-                 struct ieee80211_sub_if_data *sdata,
-                 const u8 *bssid,
-                 enum ieee80211_tx_sync_type type),
-        TP_ARGS(local, sdata, bssid, type),
-        TP_STRUCT__entry(
-                LOCAL_ENTRY
-                VIF_ENTRY
-                __array(char, bssid, ETH_ALEN)
-                __field(u32, sync_type)
-        ),
-        TP_fast_assign(
-                LOCAL_ASSIGN;
-                VIF_ASSIGN;
-                memcpy(__entry->bssid, bssid, ETH_ALEN);
-                __entry->sync_type = type;
-        ),
-        TP_printk(
-                LOCAL_PR_FMT  VIF_PR_FMT " bssid:%pM type:%d",
-                LOCAL_PR_ARG, VIF_PR_ARG, __entry->bssid, __entry->sync_type
-        )
-);
-DEFINE_EVENT(tx_sync_evt, drv_tx_sync,
-        TP_PROTO(struct ieee80211_local *local,
-                 struct ieee80211_sub_if_data *sdata,
-                 const u8 *bssid,
-                 enum ieee80211_tx_sync_type type),
-        TP_ARGS(local, sdata, bssid, type)
-);
-DEFINE_EVENT(tx_sync_evt, drv_finish_tx_sync,
-        TP_PROTO(struct ieee80211_local *local,
-                 struct ieee80211_sub_if_data *sdata,
-                 const u8 *bssid,
-                 enum ieee80211_tx_sync_type type),
-        TP_ARGS(local, sdata, bssid, type)
-);
 TRACE_EVENT(drv_prepare_multicast,
        TP_PROTO(struct ieee80211_local *local, int mc_count),
@@ -635,6 +592,38 @@ TRACE_EVENT(drv_sta_notify,
        )
 );
+TRACE_EVENT(drv_sta_state,
+        TP_PROTO(struct ieee80211_local *local,
+                 struct ieee80211_sub_if_data *sdata,
+                 struct ieee80211_sta *sta,
+                 enum ieee80211_sta_state old_state,
+                 enum ieee80211_sta_state new_state),
+        TP_ARGS(local, sdata, sta, old_state, new_state),
+        TP_STRUCT__entry(
+                LOCAL_ENTRY
+                VIF_ENTRY
+                STA_ENTRY
+                __field(u32, old_state)
+                __field(u32, new_state)
+        ),
+        TP_fast_assign(
+                LOCAL_ASSIGN;
+                VIF_ASSIGN;
+                STA_ASSIGN;
+                __entry->old_state = old_state;
+                __entry->new_state = new_state;
+        ),
+        TP_printk(
+                LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT " state: %d->%d",
+                LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG,
+                __entry->old_state, __entry->new_state
+        )
+);
 TRACE_EVENT(drv_sta_add,
        TP_PROTO(struct ieee80211_local *local,
                 struct ieee80211_sub_if_data *sdata,
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index a4643969a13b..33fd8d9f714e 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -20,7 +20,6 @@
 #include <linux/etherdevice.h>
 #include <linux/rtnetlink.h>
 #include <net/mac80211.h>
-#include <asm/unaligned.h>
 #include "ieee80211_i.h"
 #include "driver-ops.h"
@@ -36,31 +35,6 @@
 #define IEEE80211_IBSS_MAX_STA_ENTRIES 128
-static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
-                                        struct ieee80211_mgmt *mgmt,
-                                        size_t len)
-{
-        u16 auth_alg, auth_transaction;
-        lockdep_assert_held(&sdata->u.ibss.mtx);
-        if (len < 24 + 6)
-                return;
-        auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);
-        auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);
-        /*
-         * IEEE 802.11 standard does not require authentication in IBSS
-         * networks and most implementations do not seem to use it.
-         * However, try to reply to authentication attempts if someone
-         * has actually implemented this.
-         */
-        if (auth_alg == WLAN_AUTH_OPEN && auth_transaction == 1)
-                ieee80211_send_auth(sdata, 2, WLAN_AUTH_OPEN, NULL, 0,
-                                    sdata->u.ibss.bssid, NULL, 0, 0);
-}
 static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                                      const u8 *bssid, const int beacon_int,
                                      struct ieee80211_channel *chan,
@@ -92,7 +66,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
        skb_reset_tail_pointer(skb);
        skb_reserve(skb, sdata->local->hw.extra_tx_headroom);
-        if (memcmp(ifibss->bssid, bssid, ETH_ALEN))
+        if (compare_ether_addr(ifibss->bssid, bssid))
                sta_info_flush(sdata->local, sdata);
        /* if merging, indicate to driver that we leave the old IBSS */
@@ -276,7 +250,8 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                                  cbss->tsf);
 }
-static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta)
+static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta,
+                                                  bool auth)
        __acquires(RCU)
 {
        struct ieee80211_sub_if_data *sdata = sta->sdata;
@@ -290,22 +265,34 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta)
                    addr, sdata->name);
 #endif
-        sta_info_move_state(sta, IEEE80211_STA_AUTH);
+        sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
-        sta_info_move_state(sta, IEEE80211_STA_ASSOC);
+        sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
-        sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
+        /* authorize the station only if the network is not RSN protected. If
+         * not wait for the userspace to authorize it */
+        if (!sta->sdata->u.ibss.control_port)
+                sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
        rate_control_rate_init(sta);
        /* If it fails, maybe we raced another insertion? */
        if (sta_info_insert_rcu(sta))
                return sta_info_get(sdata, addr);
+        if (auth) {
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+                printk(KERN_DEBUG "TX Auth SA=%pM DA=%pM BSSID=%pM"
+                       "(auth_transaction=1)\n", sdata->vif.addr,
+                       sdata->u.ibss.bssid, addr);
+#endif
+                ieee80211_send_auth(sdata, 1, WLAN_AUTH_OPEN, NULL, 0,
+                                    addr, sdata->u.ibss.bssid, NULL, 0, 0);
+        }
        return sta;
 }
 static struct sta_info *
 ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,
                       const u8 *bssid, const u8 *addr,
-                       u32 supp_rates)
+                       u32 supp_rates, bool auth)
        __acquires(RCU)
 {
        struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
@@ -347,7 +334,42 @@ ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,
        sta->sta.supp_rates[band] = supp_rates |
                        ieee80211_mandatory_rates(local, band);
-        return ieee80211_ibss_finish_sta(sta);
+        return ieee80211_ibss_finish_sta(sta, auth);
+}
+static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
+                                        struct ieee80211_mgmt *mgmt,
+                                        size_t len)
+{
+        u16 auth_alg, auth_transaction;
+        lockdep_assert_held(&sdata->u.ibss.mtx);
+        if (len < 24 + 6)
+                return;
+        auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);
+        auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);
+        if (auth_alg != WLAN_AUTH_OPEN || auth_transaction != 1)
+                return;
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+        printk(KERN_DEBUG "%s: RX Auth SA=%pM DA=%pM BSSID=%pM."
+               "(auth_transaction=%d)\n",
+               sdata->name, mgmt->sa, mgmt->da, mgmt->bssid, auth_transaction);
+#endif
+        sta_info_destroy_addr(sdata, mgmt->sa);
+        ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, 0, false);
+        rcu_read_unlock();
+        /*
+         * IEEE 802.11 standard does not require authentication in IBSS
+         * networks and most implementations do not seem to use it.
+         * However, try to reply to authentication attempts if someone
+         * has actually implemented this.
+         */
+        ieee80211_send_auth(sdata, 2, WLAN_AUTH_OPEN, NULL, 0,
+                            mgmt->sa, sdata->u.ibss.bssid, NULL, 0, 0);
 }
 static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
@@ -381,7 +403,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                return;
        if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
-            memcmp(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0) {
+            compare_ether_addr(mgmt->bssid, sdata->u.ibss.bssid) == 0) {
                rcu_read_lock();
                sta = sta_info_get(sdata, mgmt->sa);
@@ -412,7 +434,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                        } else {
                                rcu_read_unlock();
                                sta = ieee80211_ibss_add_sta(sdata, mgmt->bssid,
-                                                mgmt->sa, supp_rates);
+                                                mgmt->sa, supp_rates, true);
                        }
                }
@@ -486,7 +508,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                goto put_bss;
        /* same BSSID */
-        if (memcmp(cbss->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0)
+        if (compare_ether_addr(cbss->bssid, sdata->u.ibss.bssid) == 0)
                goto put_bss;
        if (rx_status->flag & RX_FLAG_MACTIME_MPDU) {
@@ -540,7 +562,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                ieee80211_sta_join_ibss(sdata, bss);
                supp_rates = ieee80211_sta_get_rates(local, elems, band);
                ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa,
-                                       supp_rates);
+                                       supp_rates, true);
                rcu_read_unlock();
        }
@@ -643,8 +665,7 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
               "IBSS networks with same SSID (merge)\n", sdata->name);
        ieee80211_request_internal_scan(sdata,
-                        ifibss->ssid, ifibss->ssid_len,
+                        ifibss->ssid, ifibss->ssid_len, NULL);
-                        ifibss->fixed_channel ? ifibss->channel : NULL);
 }
 static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
@@ -810,8 +831,8 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
        if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da))
                return;
-        if (memcmp(mgmt->bssid, ifibss->bssid, ETH_ALEN) != 0 &&
+        if (compare_ether_addr(mgmt->bssid, ifibss->bssid) != 0 &&
-            memcmp(mgmt->bssid, "\xff\xff\xff\xff\xff\xff", ETH_ALEN) != 0)
+            !is_broadcast_ether_addr(mgmt->bssid))
                return;
        end = ((u8 *) mgmt) + len;
@@ -855,9 +876,6 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
        size_t baselen;
        struct ieee802_11_elems elems;
-        if (memcmp(mgmt->da, sdata->vif.addr, ETH_ALEN))
-                return; /* ignore ProbeResp to foreign address */
        baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
        if (baselen > len)
                return;
@@ -945,7 +963,7 @@ void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata)
                list_del(&sta->list);
                spin_unlock_bh(&ifibss->incomplete_lock);
-                ieee80211_ibss_finish_sta(sta);
+                ieee80211_ibss_finish_sta(sta, true);
                rcu_read_unlock();
                spin_lock_bh(&ifibss->incomplete_lock);
        }
@@ -1059,6 +1077,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
                sdata->u.ibss.fixed_bssid = false;
        sdata->u.ibss.privacy = params->privacy;
+        sdata->u.ibss.control_port = params->control_port;
        sdata->u.ibss.basic_rates = params->basic_rates;
        memcpy(sdata->vif.bss_conf.mcast_rate, params->mcast_rate,
               sizeof(params->mcast_rate));
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 2f0642d9e154..d9798a307f20 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -105,6 +105,44 @@ struct ieee80211_bss {
         */
        bool has_erp_value;
        u8 erp_value;
+        /* Keep track of the corruption of the last beacon/probe response. */
+        u8 corrupt_data;
+        /* Keep track of what bits of information we have valid info for. */
+        u8 valid_data;
+};
+/**
+ * enum ieee80211_corrupt_data_flags - BSS data corruption flags
+ * @IEEE80211_BSS_CORRUPT_BEACON: last beacon frame received was corrupted
+ * @IEEE80211_BSS_CORRUPT_PROBE_RESP: last probe response received was corrupted
+ *
+ * These are bss flags that are attached to a bss in the
+ * @corrupt_data field of &struct ieee80211_bss.
+ */
+enum ieee80211_bss_corrupt_data_flags {
+        IEEE80211_BSS_CORRUPT_BEACON            = BIT(0),
+        IEEE80211_BSS_CORRUPT_PROBE_RESP        = BIT(1)
+};
+/**
+ * enum ieee80211_valid_data_flags - BSS valid data flags
+ * @IEEE80211_BSS_VALID_DTIM: DTIM data was gathered from non-corrupt IE
+ * @IEEE80211_BSS_VALID_WMM: WMM/UAPSD data was gathered from non-corrupt IE
+ * @IEEE80211_BSS_VALID_RATES: Supported rates were gathered from non-corrupt IE
+ * @IEEE80211_BSS_VALID_ERP: ERP flag was gathered from non-corrupt IE
+ *
+ * These are bss flags that are attached to a bss in the
+ * @valid_data field of &struct ieee80211_bss.  They show which parts
+ * of the data structure were recieved as a result of an un-corrupted
+ * beacon/probe response.
+ */
+enum ieee80211_bss_valid_data_flags {
+        IEEE80211_BSS_VALID_DTIM                = BIT(0),
+        IEEE80211_BSS_VALID_WMM                 = BIT(1),
+        IEEE80211_BSS_VALID_RATES               = BIT(2),
+        IEEE80211_BSS_VALID_ERP                 = BIT(3)
 };
 static inline u8 *bss_mesh_cfg(struct ieee80211_bss *bss)
@@ -228,7 +266,7 @@ struct ieee80211_rx_data {
 struct beacon_data {
        u8 *head, *tail;
        int head_len, tail_len;
-        int dtim_period;
+        struct rcu_head rcu_head;
 };
 struct ieee80211_if_ap {
@@ -280,10 +318,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 +350,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 +363,8 @@ struct ieee80211_work {
                } offchan_tx;
        };
-        int ie_len;
+        size_t data_len;
-        /* must be last */
+        u8 data[];
-        u8 ie[0];
 };
 /* flags used in struct ieee80211_if_managed.flags */
@@ -373,6 +380,42 @@ 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 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, uapsd;
+        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 +432,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];
@@ -414,6 +459,20 @@ struct ieee80211_if_managed {
                IEEE80211_MFP_REQUIRED
        } mfp; /* management frame protection */
+        /*
+         * Bitmask of enabled u-apsd queues,
+         * IEEE80211_WMM_IE_STA_QOSINFO_AC_BE & co. Needs a new association
+         * to take effect.
+         */
+        unsigned int uapsd_queues;
+        /*
+         * Maximum number of buffered frames AP can deliver during a
+         * service period, IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL or similar.
+         * Needs a new association to take effect.
+         */
+        unsigned int uapsd_max_sp_len;
        int wmm_last_param_set;
        u8 use_4addr;
@@ -470,7 +529,9 @@ struct ieee80211_if_ibss {
        bool fixed_channel;
        bool privacy;
-        u8 bssid[ETH_ALEN];
+        bool control_port;
+        u8 bssid[ETH_ALEN] __aligned(2);
        u8 ssid[IEEE80211_MAX_SSID_LEN];
        u8 ssid_len, ie_len;
        u8 *ie;
@@ -646,6 +707,7 @@ struct ieee80211_sub_if_data {
        /* bitmap of allowed (non-MCS) rate indexes for rate control */
        u32 rc_rateidx_mask[IEEE80211_NUM_BANDS];
+        u8  rc_rateidx_mcs_mask[IEEE80211_NUM_BANDS][IEEE80211_HT_MCS_MASK_LEN];
        union {
                struct ieee80211_if_ap ap;
@@ -769,7 +831,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
@@ -970,20 +1031,6 @@ struct ieee80211_local {
                                */
        unsigned int wmm_acm; /* bit field of ACM bits (BIT(802.1D tag)) */
-        /*
-         * Bitmask of enabled u-apsd queues,
-         * IEEE80211_WMM_IE_STA_QOSINFO_AC_BE & co. Needs a new association
-         * to take effect.
-         */
-        unsigned int uapsd_queues;
-        /*
-         * Maximum number of buffered frames AP can deliver during a
-         * service period, IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL or similar.
-         * Needs a new association to take effect.
-         */
-        unsigned int uapsd_max_sp_len;
        bool pspolling;
        bool offchannel_ps_enabled;
        /*
@@ -1110,6 +1157,9 @@ struct ieee802_11_elems {
        u8 quiet_elem_len;
        u8 num_of_quiet_elem;   /* can be more the one */
        u8 timeout_int_len;
+        /* whether a parse error occurred while retrieving these elements */
+        bool parse_error;
 };
 static inline struct ieee80211_local *hw_to_local(
@@ -1118,12 +1168,6 @@ static inline struct ieee80211_local *hw_to_local(
        return container_of(hw, struct ieee80211_local, hw);
 }
-static inline struct ieee80211_hw *local_to_hw(
-        struct ieee80211_local *local)
-{
-        return &local->hw;
-}
 static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)
 {
@@ -1146,11 +1190,9 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
 int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
                        struct cfg80211_assoc_request *req);
 int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
-                         struct cfg80211_deauth_request *req,
+                         struct cfg80211_deauth_request *req);
-                         void *cookie);
 int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
-                           struct cfg80211_disassoc_request *req,
+                           struct cfg80211_disassoc_request *req);
-                           void *cookie);
 void ieee80211_send_pspoll(struct ieee80211_local *local,
                           struct ieee80211_sub_if_data *sdata);
 void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency);
@@ -1168,6 +1210,7 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
                                  struct sk_buff *skb);
 void ieee80211_sta_reset_beacon_monitor(struct ieee80211_sub_if_data *sdata);
 void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata);
+void ieee80211_mgd_teardown(struct ieee80211_sub_if_data *sdata);
 /* IBSS code */
 void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local);
@@ -1345,7 +1388,8 @@ int ieee80211_frame_duration(struct ieee80211_local *local, size_t len,
 void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx,
                                     struct ieee80211_hdr *hdr, const u8 *tsc,
                                     gfp_t gfp);
-void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata);
+void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
+                               bool bss_notify);
 void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb);
 void ieee80211_tx_skb_tid(struct ieee80211_sub_if_data *sdata,
@@ -1396,7 +1440,7 @@ void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
 void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
                         u16 transaction, u16 auth_alg,
                         u8 *extra, size_t extra_len, const u8 *bssid,
-                         const u8 *key, u8 key_len, u8 key_idx);
+                         const u8 *da, const u8 *key, u8 key_len, u8 key_idx);
 int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer,
                             const u8 *ie, size_t ie_len,
                             enum ieee80211_band band, u32 rate_mask,
@@ -1436,8 +1480,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,
@@ -1460,6 +1502,9 @@ bool ieee80211_set_channel_type(struct ieee80211_local *local,
                                enum nl80211_channel_type chantype);
 enum nl80211_channel_type
 ieee80211_ht_info_to_channel_type(struct ieee80211_ht_info *ht_info);
+enum nl80211_channel_type ieee80211_get_tx_channel_type(
+                                        struct ieee80211_local *local,
+                                        enum nl80211_channel_type channel_type);
 #ifdef CONFIG_MAC80211_NOINLINE
 #define debug_noinline noinline
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 8e2137bd87e2..401c01f0731e 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -304,7 +304,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
                 * need to initialise the hardware if the hardware
                 * doesn't start up with sane defaults
                 */
-                ieee80211_set_wmm_default(sdata);
+                ieee80211_set_wmm_default(sdata, true);
        }
        set_bit(SDATA_STATE_RUNNING, &sdata->state);
@@ -318,9 +318,9 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
                        goto err_del_interface;
                }
-                sta_info_move_state(sta, IEEE80211_STA_AUTH);
+                sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
-                sta_info_move_state(sta, IEEE80211_STA_ASSOC);
+                sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
-                sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
+                sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
                res = sta_info_insert(sta);
                if (res) {
@@ -644,6 +644,8 @@ static void ieee80211_teardown_sdata(struct net_device *dev)
        if (ieee80211_vif_is_mesh(&sdata->vif))
                mesh_rmc_free(sdata);
+        else if (sdata->vif.type == NL80211_IFTYPE_STATION)
+                ieee80211_mgd_teardown(sdata);
        flushed = sta_info_flush(local, sdata);
        WARN_ON(flushed);
@@ -1181,6 +1183,13 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
                sband = local->hw.wiphy->bands[i];
                sdata->rc_rateidx_mask[i] =
                        sband ? (1 << sband->n_bitrates) - 1 : 0;
+                if (sband)
+                        memcpy(sdata->rc_rateidx_mcs_mask[i],
+                               sband->ht_cap.mcs.rx_mask,
+                               sizeof(sdata->rc_rateidx_mcs_mask[i]));
+                else
+                        memset(sdata->rc_rateidx_mcs_mask[i], 0,
+                               sizeof(sdata->rc_rateidx_mcs_mask[i]));
        }
        /* setup type-dependent data */
@@ -1303,7 +1312,9 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
                /* do not count disabled managed interfaces */
                if (sdata->vif.type == NL80211_IFTYPE_STATION &&
-                    !sdata->u.mgd.associated) {
+                    !sdata->u.mgd.associated &&
+                    !sdata->u.mgd.auth_data &&
+                    !sdata->u.mgd.assoc_data) {
                        sdata->vif.bss_conf.idle = true;
                        continue;
                }
@@ -1323,7 +1334,8 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
                wk->sdata->vif.bss_conf.idle = false;
        }
-        if (local->scan_sdata) {
+        if (local->scan_sdata &&
+            !(local->hw.flags & IEEE80211_HW_SCAN_WHILE_IDLE)) {
                scanning = true;
                local->scan_sdata->vif.bss_conf.idle = false;
        }
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 87a89741432d..5bb600d93d77 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/export.h>
 #include <net/mac80211.h>
+#include <asm/unaligned.h>
 #include "ieee80211_i.h"
 #include "driver-ops.h"
 #include "debugfs_key.h"
@@ -54,14 +55,6 @@ static void assert_key_lock(struct ieee80211_local *local)
        lockdep_assert_held(&local->key_mtx);
 }
-static struct ieee80211_sta *get_sta_for_key(struct ieee80211_key *key)
-{
-        if (key->sta)
-                return &key->sta->sta;
-        return NULL;
-}
 static void increment_tailroom_need_count(struct ieee80211_sub_if_data *sdata)
 {
        /*
@@ -95,7 +88,7 @@ static void increment_tailroom_need_count(struct ieee80211_sub_if_data *sdata)
 static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
 {
        struct ieee80211_sub_if_data *sdata;
-        struct ieee80211_sta *sta;
+        struct sta_info *sta;
        int ret;
        might_sleep();
@@ -105,7 +98,7 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
        assert_key_lock(key->local);
-        sta = get_sta_for_key(key);
+        sta = key->sta;
        /*
         * If this is a per-STA GTK, check if it
@@ -115,6 +108,9 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
            !(key->local->hw.flags & IEEE80211_HW_SUPPORTS_PER_STA_GTK))
                goto out_unsupported;
+        if (sta && !sta->uploaded)
+                goto out_unsupported;
        sdata = key->sdata;
        if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
                /*
@@ -123,12 +119,10 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
                 */
                if (!(key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE))
                        goto out_unsupported;
-                sdata = container_of(sdata->bss,
-                                     struct ieee80211_sub_if_data,
-                                     u.ap);
        }
-        ret = drv_set_key(key->local, SET_KEY, sdata, sta, &key->conf);
+        ret = drv_set_key(key->local, SET_KEY, sdata,
+                          sta ? &sta->sta : NULL, &key->conf);
        if (!ret) {
                key->flags |= KEY_FLAG_UPLOADED_TO_HARDWARE;
@@ -147,7 +141,8 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
        if (ret != -ENOSPC && ret != -EOPNOTSUPP)
                wiphy_err(key->local->hw.wiphy,
                          "failed to set key (%d, %pM) to hardware (%d)\n",
-                          key->conf.keyidx, sta ? sta->addr : bcast_addr, ret);
+                          key->conf.keyidx,
+                          sta ? sta->sta.addr : bcast_addr, ret);
 out_unsupported:
        switch (key->conf.cipher) {
@@ -166,7 +161,7 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
 static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
 {
        struct ieee80211_sub_if_data *sdata;
-        struct ieee80211_sta *sta;
+        struct sta_info *sta;
        int ret;
        might_sleep();
@@ -179,7 +174,7 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
        if (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))
                return;
-        sta = get_sta_for_key(key);
+        sta = key->sta;
        sdata = key->sdata;
        if (!((key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIC) ||
@@ -187,18 +182,14 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
              (key->conf.flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)))
                increment_tailroom_need_count(sdata);
-        if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
-                sdata = container_of(sdata->bss,
-                                     struct ieee80211_sub_if_data,
-                                     u.ap);
        ret = drv_set_key(key->local, DISABLE_KEY, sdata,
-                          sta, &key->conf);
+                          sta ? &sta->sta : NULL, &key->conf);
        if (ret)
                wiphy_err(key->local->hw.wiphy,
                          "failed to remove key (%d, %pM) from hardware (%d)\n",
-                          key->conf.keyidx, sta ? sta->addr : bcast_addr, ret);
+                          key->conf.keyidx,
+                          sta ? sta->sta.addr : bcast_addr, ret);
        key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;
 }
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index b142bd4c2390..b581a24fa15c 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -155,7 +155,8 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
                power = chan->max_power;
        else
                power = local->power_constr_level ?
-                        (chan->max_power - local->power_constr_level) :
+                        min(chan->max_power,
+                                (chan->max_reg_power  - local->power_constr_level)) :
                        chan->max_power;
        if (local->user_power_level >= 0)
@@ -198,15 +199,7 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
                return;
        if (sdata->vif.type == NL80211_IFTYPE_STATION) {
-                /*
+                sdata->vif.bss_conf.bssid = sdata->u.mgd.bssid;
-                 * While not associated, claim a BSSID of all-zeroes
-                 * so that drivers don't do any weird things with the
-                 * BSSID at that time.
-                 */
-                if (sdata->vif.bss_conf.assoc)
-                        sdata->vif.bss_conf.bssid = sdata->u.mgd.bssid;
-                else
-                        sdata->vif.bss_conf.bssid = zero;
        } else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
                sdata->vif.bss_conf.bssid = sdata->u.ibss.bssid;
        else if (sdata->vif.type == NL80211_IFTYPE_AP)
@@ -293,11 +286,11 @@ static void ieee80211_tasklet_handler(unsigned long data)
                        /* Clear skb->pkt_type in order to not confuse kernel
                         * netstack. */
                        skb->pkt_type = 0;
-                        ieee80211_rx(local_to_hw(local), skb);
+                        ieee80211_rx(&local->hw, skb);
                        break;
                case IEEE80211_TX_STATUS_MSG:
                        skb->pkt_type = 0;
-                        ieee80211_tx_status(local_to_hw(local), skb);
+                        ieee80211_tx_status(&local->hw, skb);
                        break;
                case IEEE80211_EOSP_MSG:
                        eosp_data = (void *)skb->cb;
@@ -534,6 +527,9 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
        int priv_size, i;
        struct wiphy *wiphy;
+        if (WARN_ON(ops->sta_state && (ops->sta_add || ops->sta_remove)))
+                return NULL;
        /* Ensure 32-byte alignment of our private data and hw private data.
         * We use the wiphy priv data for both our ieee80211_local and for
         * the driver's private data
@@ -599,8 +595,6 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
        local->hw.conf.long_frame_max_tx_count = wiphy->retry_long;
        local->hw.conf.short_frame_max_tx_count = wiphy->retry_short;
        local->user_power_level = -1;
-        local->uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;
-        local->uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
        wiphy->ht_capa_mod_mask = &mac80211_ht_capa_mod_mask;
        INIT_LIST_HEAD(&local->interfaces);
@@ -672,7 +666,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
        ieee80211_hw_roc_setup(local);
-        return local_to_hw(local);
+        return &local->hw;
 }
 EXPORT_SYMBOL(ieee80211_alloc_hw);
@@ -701,6 +695,9 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
            )
                return -EINVAL;
+        if ((hw->flags & IEEE80211_HW_SCAN_WHILE_IDLE) && !local->ops->hw_scan)
+                return -EINVAL;
        if (hw->max_report_rates == 0)
                hw->max_report_rates = hw->max_rates;
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index c707c8bf6d2c..e5fbb7cf3562 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -204,7 +204,7 @@ int mesh_rmc_check(u8 *sa, struct ieee80211s_hdr *mesh_hdr,
                        kmem_cache_free(rm_cache, p);
                        --entries;
                } else if ((seqnum == p->seqnum) &&
-                           (memcmp(sa, p->sa, ETH_ALEN) == 0))
+                           (compare_ether_addr(sa, p->sa) == 0))
                        return -1;
        }
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index bd14bd26a2b6..8d53b71378e3 100644
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -13,7 +13,6 @@
 #include <linux/types.h>
 #include <linux/jhash.h>
-#include <asm/unaligned.h>
 #include "ieee80211_i.h"
@@ -86,6 +85,8 @@ enum mesh_deferred_task_flags {
 * @state_lock: mesh path state lock used to protect changes to the
 * mpath itself.  No need to take this lock when adding or removing
 * an mpath to a hash bucket on a path table.
+ * @rann_snd_addr: the RANN sender address
+ * @is_root: the destination station of this path is a root node
 * @is_gate: the destination station of this path is a mesh gate
 *
 *
@@ -110,6 +111,8 @@ struct mesh_path {
        u8 discovery_retries;
        enum mesh_path_flags flags;
        spinlock_t state_lock;
+        u8 rann_snd_addr[ETH_ALEN];
+        bool is_root;
        bool is_gate;
 };
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 54df1b2bafd2..1c6f3d02aebf 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -8,6 +8,8 @@
 */
 #include <linux/slab.h>
+#include <linux/etherdevice.h>
+#include <asm/unaligned.h>
 #include "wme.h"
 #include "mesh.h"
@@ -322,6 +324,7 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local,
                                   struct sta_info *sta)
 {
        struct ieee80211_supported_band *sband;
+        struct rate_info rinfo;
        /* This should be adjusted for each device */
        int device_constant = 1 << ARITH_SHIFT;
        int test_frame_len = TEST_FRAME_LEN << ARITH_SHIFT;
@@ -335,7 +338,9 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local,
        if (sta->fail_avg >= 100)
                return MAX_METRIC;
-        if (sta->last_tx_rate.flags & IEEE80211_TX_RC_MCS)
+        sta_set_rate_info_tx(sta, &sta->last_tx_rate, &rinfo);
+        rate = cfg80211_calculate_bitrate(&rinfo);
+        if (WARN_ON(!rate))
                return MAX_METRIC;
        err = (sta->fail_avg << ARITH_SHIFT) / 100;
@@ -343,7 +348,6 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local,
        /* bitrate is in units of 100 Kbps, while we need rate in units of
         * 1Mbps. This will be corrected on tx_time computation.
         */
-        rate = sband->bitrates[sta->last_tx_rate.idx].bitrate;
        tx_time = (device_constant + 10 * test_frame_len / rate);
        estimated_retx = ((1 << (2 * ARITH_SHIFT)) / (s_unit - err));
        result = (tx_time * estimated_retx) >> (2 * ARITH_SHIFT) ;
@@ -418,7 +422,7 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata,
                new_metric = MAX_METRIC;
        exp_time = TU_TO_EXP_TIME(orig_lifetime);
-        if (memcmp(orig_addr, sdata->vif.addr, ETH_ALEN) == 0) {
+        if (compare_ether_addr(orig_addr, sdata->vif.addr) == 0) {
                /* This MP is the originator, we are not interested in this
                 * frame, except for updating transmitter's path info.
                 */
@@ -468,7 +472,7 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata,
        /* Update and check transmitter routing info */
        ta = mgmt->sa;
-        if (memcmp(orig_addr, ta, ETH_ALEN) == 0)
+        if (compare_ether_addr(orig_addr, ta) == 0)
                fresh_info = false;
        else {
                fresh_info = true;
@@ -512,8 +516,9 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
                                    u8 *preq_elem, u32 metric)
 {
        struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
-        struct mesh_path *mpath;
+        struct mesh_path *mpath = NULL;
        u8 *target_addr, *orig_addr;
+        const u8 *da;
        u8 target_flags, ttl;
        u32 orig_sn, target_sn, lifetime;
        bool reply = false;
@@ -528,7 +533,7 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
        mhwmp_dbg("received PREQ from %pM", orig_addr);
-        if (memcmp(target_addr, sdata->vif.addr, ETH_ALEN) == 0) {
+        if (compare_ether_addr(target_addr, sdata->vif.addr) == 0) {
                mhwmp_dbg("PREQ is for us");
                forward = false;
                reply = true;
@@ -575,7 +580,7 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
                        ifmsh->mshstats.dropped_frames_ttl++;
        }
-        if (forward) {
+        if (forward && ifmsh->mshcfg.dot11MeshForwarding) {
                u32 preq_id;
                u8 hopcount, flags;
@@ -590,9 +595,11 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
                flags = PREQ_IE_FLAGS(preq_elem);
                preq_id = PREQ_IE_PREQ_ID(preq_elem);
                hopcount = PREQ_IE_HOPCOUNT(preq_elem) + 1;
+                da = (mpath && mpath->is_root) ?
+                        mpath->rann_snd_addr : broadcast_addr;
                mesh_path_sel_frame_tx(MPATH_PREQ, flags, orig_addr,
                                cpu_to_le32(orig_sn), target_flags, target_addr,
-                                cpu_to_le32(target_sn), broadcast_addr,
+                                cpu_to_le32(target_sn), da,
                                hopcount, ttl, cpu_to_le32(lifetime),
                                cpu_to_le32(metric), cpu_to_le32(preq_id),
                                sdata);
@@ -614,6 +621,7 @@ static void hwmp_prep_frame_process(struct ieee80211_sub_if_data *sdata,
                                    struct ieee80211_mgmt *mgmt,
                                    u8 *prep_elem, u32 metric)
 {
+        struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
        struct mesh_path *mpath;
        u8 *target_addr, *orig_addr;
        u8 ttl, hopcount, flags;
@@ -623,10 +631,13 @@ static void hwmp_prep_frame_process(struct ieee80211_sub_if_data *sdata,
        mhwmp_dbg("received PREP from %pM", PREP_IE_ORIG_ADDR(prep_elem));
        orig_addr = PREP_IE_ORIG_ADDR(prep_elem);
-        if (memcmp(orig_addr, sdata->vif.addr, ETH_ALEN) == 0)
+        if (compare_ether_addr(orig_addr, sdata->vif.addr) == 0)
                /* destination, no forwarding required */
                return;
+        if (!ifmsh->mshcfg.dot11MeshForwarding)
+                return;
        ttl = PREP_IE_TTL(prep_elem);
        if (ttl <= 1) {
                sdata->u.mesh.mshstats.dropped_frames_ttl++;
@@ -693,21 +704,26 @@ static void hwmp_perr_frame_process(struct ieee80211_sub_if_data *sdata,
        rcu_read_lock();
        mpath = mesh_path_lookup(target_addr, sdata);
        if (mpath) {
+                struct sta_info *sta;
                spin_lock_bh(&mpath->state_lock);
+                sta = next_hop_deref_protected(mpath);
                if (mpath->flags & MESH_PATH_ACTIVE &&
-                    memcmp(ta, next_hop_deref_protected(mpath)->sta.addr,
+                    compare_ether_addr(ta, sta->sta.addr) == 0 &&
-                                                        ETH_ALEN) == 0 &&
                    (!(mpath->flags & MESH_PATH_SN_VALID) ||
                    SN_GT(target_sn, mpath->sn))) {
                        mpath->flags &= ~MESH_PATH_ACTIVE;
                        mpath->sn = target_sn;
                        spin_unlock_bh(&mpath->state_lock);
+                        if (!ifmsh->mshcfg.dot11MeshForwarding)
+                                goto endperr;
                        mesh_path_error_tx(ttl, target_addr, cpu_to_le32(target_sn),
                                           cpu_to_le16(target_rcode),
                                           broadcast_addr, sdata);
                } else
                        spin_unlock_bh(&mpath->state_lock);
        }
+endperr:
        rcu_read_unlock();
 }
@@ -738,11 +754,11 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata,
        metric = rann->rann_metric;
        /*  Ignore our own RANNs */
-        if (memcmp(orig_addr, sdata->vif.addr, ETH_ALEN) == 0)
+        if (compare_ether_addr(orig_addr, sdata->vif.addr) == 0)
                return;
-        mhwmp_dbg("received RANN from %pM (is_gate=%d)", orig_addr,
+        mhwmp_dbg("received RANN from %pM via neighbour %pM (is_gate=%d)",
-                        root_is_gate);
+                        orig_addr, mgmt->sa, root_is_gate);
        rcu_read_lock();
        mpath = mesh_path_lookup(orig_addr, sdata);
@@ -764,7 +780,7 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata,
                mesh_queue_preq(mpath, PREQ_Q_F_START | PREQ_Q_F_REFRESH);
        }
-        if (mpath->sn < orig_sn) {
+        if (mpath->sn < orig_sn && ifmsh->mshcfg.dot11MeshForwarding) {
                mesh_path_sel_frame_tx(MPATH_RANN, flags, orig_addr,
                                       cpu_to_le32(orig_sn),
                                       0, NULL, 0, broadcast_addr,
@@ -773,6 +789,11 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata,
                                       0, sdata);
                mpath->sn = orig_sn;
        }
+        /* Using individually addressed PREQ for root node */
+        memcpy(mpath->rann_snd_addr, mgmt->sa, ETH_ALEN);
+        mpath->is_root = true;
        if (root_is_gate)
                mesh_path_add_gate(mpath);
@@ -908,6 +929,7 @@ void mesh_path_start_discovery(struct ieee80211_sub_if_data *sdata)
        struct mesh_preq_queue *preq_node;
        struct mesh_path *mpath;
        u8 ttl, target_flags;
+        const u8 *da;
        u32 lifetime;
        spin_lock_bh(&ifmsh->mesh_preq_queue_lock);
@@ -970,9 +992,10 @@ void mesh_path_start_discovery(struct ieee80211_sub_if_data *sdata)
                target_flags = MP_F_RF;
        spin_unlock_bh(&mpath->state_lock);
+        da = (mpath->is_root) ? mpath->rann_snd_addr : broadcast_addr;
        mesh_path_sel_frame_tx(MPATH_PREQ, 0, sdata->vif.addr,
                        cpu_to_le32(ifmsh->sn), target_flags, mpath->dst,
-                        cpu_to_le32(mpath->sn), broadcast_addr, 0,
+                        cpu_to_le32(mpath->sn), da, 0,
                        ttl, cpu_to_le32(lifetime), 0,
                        cpu_to_le32(ifmsh->preq_id++), sdata);
        mod_timer(&mpath->timer, jiffies + mpath->discovery_timeout);
@@ -1063,7 +1086,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,
        if (time_after(jiffies,
                       mpath->exp_time -
                       msecs_to_jiffies(sdata->u.mesh.mshcfg.path_refresh_time)) &&
-            !memcmp(sdata->vif.addr, hdr->addr4, ETH_ALEN) &&
+            !compare_ether_addr(sdata->vif.addr, hdr->addr4) &&
            !(mpath->flags & MESH_PATH_RESOLVING) &&
            !(mpath->flags & MESH_PATH_FIXED))
                mesh_queue_preq(mpath, PREQ_Q_F_START | PREQ_Q_F_REFRESH);
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 30420bc1f699..49aaefd99635 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -336,7 +336,7 @@ static void mesh_path_move_to_queue(struct mesh_path *gate_mpath,
 }
-static struct mesh_path *path_lookup(struct mesh_table *tbl, u8 *dst,
+static struct mesh_path *mpath_lookup(struct mesh_table *tbl, u8 *dst,
                                          struct ieee80211_sub_if_data *sdata)
 {
        struct mesh_path *mpath;
@@ -348,7 +348,7 @@ static struct mesh_path *path_lookup(struct mesh_table *tbl, u8 *dst,
        hlist_for_each_entry_rcu(node, n, bucket, list) {
                mpath = node->mpath;
                if (mpath->sdata == sdata &&
-                                memcmp(dst, mpath->dst, ETH_ALEN) == 0) {
+                                compare_ether_addr(dst, mpath->dst) == 0) {
                        if (MPATH_EXPIRED(mpath)) {
                                spin_lock_bh(&mpath->state_lock);
                                mpath->flags &= ~MESH_PATH_ACTIVE;
@@ -371,12 +371,12 @@ static struct mesh_path *path_lookup(struct mesh_table *tbl, u8 *dst,
 */
 struct mesh_path *mesh_path_lookup(u8 *dst, struct ieee80211_sub_if_data *sdata)
 {
-        return path_lookup(rcu_dereference(mesh_paths), dst, sdata);
+        return mpath_lookup(rcu_dereference(mesh_paths), dst, sdata);
 }
 struct mesh_path *mpp_path_lookup(u8 *dst, struct ieee80211_sub_if_data *sdata)
 {
-        return path_lookup(rcu_dereference(mpp_paths), dst, sdata);
+        return mpath_lookup(rcu_dereference(mpp_paths), dst, sdata);
 }
@@ -517,7 +517,7 @@ int mesh_path_add(u8 *dst, struct ieee80211_sub_if_data *sdata)
        int err = 0;
        u32 hash_idx;
-        if (memcmp(dst, sdata->vif.addr, ETH_ALEN) == 0)
+        if (compare_ether_addr(dst, sdata->vif.addr) == 0)
                /* never add ourselves as neighbours */
                return -ENOTSUPP;
@@ -553,12 +553,13 @@ int mesh_path_add(u8 *dst, struct ieee80211_sub_if_data *sdata)
        hash_idx = mesh_table_hash(dst, sdata, tbl);
        bucket = &tbl->hash_buckets[hash_idx];
-        spin_lock_bh(&tbl->hashwlock[hash_idx]);
+        spin_lock(&tbl->hashwlock[hash_idx]);
        err = -EEXIST;
        hlist_for_each_entry(node, n, bucket, list) {
                mpath = node->mpath;
-                if (mpath->sdata == sdata && memcmp(dst, mpath->dst, ETH_ALEN) == 0)
+                if (mpath->sdata == sdata &&
+                    compare_ether_addr(dst, mpath->dst) == 0)
                        goto err_exists;
        }
@@ -569,7 +570,7 @@ int mesh_path_add(u8 *dst, struct ieee80211_sub_if_data *sdata)
        mesh_paths_generation++;
-        spin_unlock_bh(&tbl->hashwlock[hash_idx]);
+        spin_unlock(&tbl->hashwlock[hash_idx]);
        read_unlock_bh(&pathtbl_resize_lock);
        if (grow) {
                set_bit(MESH_WORK_GROW_MPATH_TABLE,  &ifmsh->wrkq_flags);
@@ -578,7 +579,7 @@ int mesh_path_add(u8 *dst, struct ieee80211_sub_if_data *sdata)
        return 0;
 err_exists:
-        spin_unlock_bh(&tbl->hashwlock[hash_idx]);
+        spin_unlock(&tbl->hashwlock[hash_idx]);
        read_unlock_bh(&pathtbl_resize_lock);
        kfree(new_node);
 err_node_alloc:
@@ -649,7 +650,7 @@ int mpp_path_add(u8 *dst, u8 *mpp, struct ieee80211_sub_if_data *sdata)
        int err = 0;
        u32 hash_idx;
-        if (memcmp(dst, sdata->vif.addr, ETH_ALEN) == 0)
+        if (compare_ether_addr(dst, sdata->vif.addr) == 0)
                /* never add ourselves as neighbours */
                return -ENOTSUPP;
@@ -681,12 +682,13 @@ int mpp_path_add(u8 *dst, u8 *mpp, struct ieee80211_sub_if_data *sdata)
        hash_idx = mesh_table_hash(dst, sdata, tbl);
        bucket = &tbl->hash_buckets[hash_idx];
-        spin_lock_bh(&tbl->hashwlock[hash_idx]);
+        spin_lock(&tbl->hashwlock[hash_idx]);
        err = -EEXIST;
        hlist_for_each_entry(node, n, bucket, list) {
                mpath = node->mpath;
-                if (mpath->sdata == sdata && memcmp(dst, mpath->dst, ETH_ALEN) == 0)
+                if (mpath->sdata == sdata &&
+                    compare_ether_addr(dst, mpath->dst) == 0)
                        goto err_exists;
        }
@@ -695,7 +697,7 @@ int mpp_path_add(u8 *dst, u8 *mpp, struct ieee80211_sub_if_data *sdata)
            tbl->mean_chain_len * (tbl->hash_mask + 1))
                grow = 1;
-        spin_unlock_bh(&tbl->hashwlock[hash_idx]);
+        spin_unlock(&tbl->hashwlock[hash_idx]);
        read_unlock_bh(&pathtbl_resize_lock);
        if (grow) {
                set_bit(MESH_WORK_GROW_MPP_TABLE,  &ifmsh->wrkq_flags);
@@ -704,7 +706,7 @@ int mpp_path_add(u8 *dst, u8 *mpp, struct ieee80211_sub_if_data *sdata)
        return 0;
 err_exists:
-        spin_unlock_bh(&tbl->hashwlock[hash_idx]);
+        spin_unlock(&tbl->hashwlock[hash_idx]);
        read_unlock_bh(&pathtbl_resize_lock);
        kfree(new_node);
 err_node_alloc:
@@ -803,9 +805,9 @@ void mesh_path_flush_by_nexthop(struct sta_info *sta)
        for_each_mesh_entry(tbl, p, node, i) {
                mpath = node->mpath;
                if (rcu_dereference(mpath->next_hop) == sta) {
-                        spin_lock_bh(&tbl->hashwlock[i]);
+                        spin_lock(&tbl->hashwlock[i]);
                        __mesh_path_del(tbl, node);
-                        spin_unlock_bh(&tbl->hashwlock[i]);
+                        spin_unlock(&tbl->hashwlock[i]);
                }
        }
        read_unlock_bh(&pathtbl_resize_lock);
@@ -876,11 +878,11 @@ int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata)
        hash_idx = mesh_table_hash(addr, sdata, tbl);
        bucket = &tbl->hash_buckets[hash_idx];
-        spin_lock_bh(&tbl->hashwlock[hash_idx]);
+        spin_lock(&tbl->hashwlock[hash_idx]);
        hlist_for_each_entry(node, n, bucket, list) {
                mpath = node->mpath;
                if (mpath->sdata == sdata &&
-                    memcmp(addr, mpath->dst, ETH_ALEN) == 0) {
+                    compare_ether_addr(addr, mpath->dst) == 0) {
                        __mesh_path_del(tbl, node);
                        goto enddel;
                }
@@ -889,7 +891,7 @@ int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata)
        err = -ENXIO;
 enddel:
        mesh_paths_generation++;
-        spin_unlock_bh(&tbl->hashwlock[hash_idx]);
+        spin_unlock(&tbl->hashwlock[hash_idx]);
        read_unlock_bh(&pathtbl_resize_lock);
        return err;
 }
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index a17251730b9e..4e53c4cbca9e 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -31,6 +31,12 @@
 #define dot11MeshHoldingTimeout(s) (s->u.mesh.mshcfg.dot11MeshHoldingTimeout)
 #define dot11MeshMaxPeerLinks(s) (s->u.mesh.mshcfg.dot11MeshMaxPeerLinks)
+/* We only need a valid sta if user configured a minimum rssi_threshold. */
+#define rssi_threshold_check(sta, sdata) \
+                (sdata->u.mesh.mshcfg.rssi_threshold == 0 ||\
+                (sta && (s8) -ewma_read(&sta->avg_signal) > \
+                sdata->u.mesh.mshcfg.rssi_threshold))
 enum plink_event {
        PLINK_UNDEFINED,
        OPN_ACPT,
@@ -96,9 +102,9 @@ static struct sta_info *mesh_plink_alloc(struct ieee80211_sub_if_data *sdata,
        if (!sta)
                return NULL;
-        sta_info_move_state(sta, IEEE80211_STA_AUTH);
+        sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
-        sta_info_move_state(sta, IEEE80211_STA_ASSOC);
+        sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
-        sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
+        sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
        set_sta_flag(sta, WLAN_STA_WME);
@@ -301,7 +307,8 @@ void mesh_neighbour_update(u8 *hw_addr, u32 rates,
        if (mesh_peer_accepts_plinks(elems) &&
                        sta->plink_state == NL80211_PLINK_LISTEN &&
                        sdata->u.mesh.accepting_plinks &&
-                        sdata->u.mesh.mshcfg.auto_open_plinks)
+                        sdata->u.mesh.mshcfg.auto_open_plinks &&
+                        rssi_threshold_check(sta, sdata))
                mesh_plink_open(sta);
        rcu_read_unlock();
@@ -531,6 +538,14 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                return;
        }
+        if (ftype == WLAN_SP_MESH_PEERING_OPEN &&
+            !rssi_threshold_check(sta, sdata)) {
+                mpl_dbg("Mesh plink: %pM does not meet rssi threshold\n",
+                        mgmt->sa);
+                rcu_read_unlock();
+                return;
+        }
        if (sta && !test_sta_flag(sta, WLAN_STA_AUTH)) {
                mpl_dbg("Mesh plink: Action frame from non-authed peer\n");
                rcu_read_unlock();
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 295be92f7c77..576fb25456dd 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -30,6 +30,12 @@
 #include "rate.h"
 #include "led.h"
+#define IEEE80211_AUTH_TIMEOUT (HZ / 5)
+#define IEEE80211_AUTH_MAX_TRIES 3
+#define IEEE80211_AUTH_WAIT_ASSOC (HZ * 5)
+#define IEEE80211_ASSOC_TIMEOUT (HZ / 5)
+#define IEEE80211_ASSOC_MAX_TRIES 3
 static int max_nullfunc_tries = 2;
 module_param(max_nullfunc_tries, int, 0644);
 MODULE_PARM_DESC(max_nullfunc_tries,
@@ -82,6 +88,8 @@ MODULE_PARM_DESC(probe_wait_ms,
 #define TMR_RUNNING_TIMER       0
 #define TMR_RUNNING_CHANSW      1
+#define DEAUTH_DISASSOC_LEN     (24 /* hdr */ + 2 /* reason */)
 /*
 * All cfg80211 functions have to be called outside a locked
 * section so that they can acquire a lock themselves... This
@@ -97,6 +105,15 @@ enum rx_mgmt_action {
        /* caller must call cfg80211_send_disassoc() */
        RX_MGMT_CFG80211_DISASSOC,
+        /* caller must call cfg80211_send_rx_auth() */
+        RX_MGMT_CFG80211_RX_AUTH,
+        /* caller must call cfg80211_send_rx_assoc() */
+        RX_MGMT_CFG80211_RX_ASSOC,
+        /* caller must call cfg80211_send_assoc_timeout() */
+        RX_MGMT_CFG80211_ASSOC_TIMEOUT,
 };
 /* utils */
@@ -115,8 +132,7 @@ static inline void ASSERT_MGD_MTX(struct ieee80211_if_managed *ifmgd)
 * has happened -- the work that runs from this timer will
 * do that.
 */
-static void run_again(struct ieee80211_if_managed *ifmgd,
+static void run_again(struct ieee80211_if_managed *ifmgd, unsigned long timeout)
-                             unsigned long timeout)
 {
        ASSERT_MGD_MTX(ifmgd);
@@ -127,7 +143,7 @@ static void run_again(struct ieee80211_if_managed *ifmgd,
 void ieee80211_sta_reset_beacon_monitor(struct ieee80211_sub_if_data *sdata)
 {
-        if (sdata->local->hw.flags & IEEE80211_HW_BEACON_FILTER)
+        if (sdata->vif.driver_flags & IEEE80211_VIF_BEACON_FILTER)
                return;
        mod_timer(&sdata->u.mgd.bcn_mon_timer,
@@ -173,40 +189,35 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
        u16 ht_opmode;
        bool enable_ht = true;
        enum nl80211_channel_type prev_chantype;
-        enum nl80211_channel_type channel_type = NL80211_CHAN_NO_HT;
+        enum nl80211_channel_type rx_channel_type = NL80211_CHAN_NO_HT;
+        enum nl80211_channel_type tx_channel_type;
        sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
        prev_chantype = sdata->vif.bss_conf.channel_type;
-        /* HT is not supported */
-        if (!sband->ht_cap.ht_supported)
-                enable_ht = false;
-        if (enable_ht) {
+        hti_cfreq = ieee80211_channel_to_frequency(hti->control_chan,
-                hti_cfreq = ieee80211_channel_to_frequency(hti->control_chan,
+                                                   sband->band);
-                                                           sband->band);
+        /* check that channel matches the right operating channel */
-                /* check that channel matches the right operating channel */
+        if (local->hw.conf.channel->center_freq != hti_cfreq) {
-                if (local->hw.conf.channel->center_freq != hti_cfreq) {
+                /* Some APs mess this up, evidently.
-                        /* Some APs mess this up, evidently.
+                 * Netgear WNDR3700 sometimes reports 4 higher than
-                         * Netgear WNDR3700 sometimes reports 4 higher than
+                 * the actual channel, for instance.
-                         * the actual channel, for instance.
+                 */
-                         */
+                printk(KERN_DEBUG
-                        printk(KERN_DEBUG
+                       "%s: Wrong control channel in association"
-                               "%s: Wrong control channel in association"
+                       " response: configured center-freq: %d"
-                               " response: configured center-freq: %d"
+                       " hti-cfreq: %d  hti->control_chan: %d"
-                               " hti-cfreq: %d  hti->control_chan: %d"
+                       " band: %d.  Disabling HT.\n",
-                               " band: %d.  Disabling HT.\n",
+                       sdata->name,
-                               sdata->name,
+                       local->hw.conf.channel->center_freq,
-                               local->hw.conf.channel->center_freq,
+                       hti_cfreq, hti->control_chan,
-                               hti_cfreq, hti->control_chan,
+                       sband->band);
-                               sband->band);
+                enable_ht = false;
-                        enable_ht = false;
-                }
        }
        if (enable_ht) {
-                channel_type = NL80211_CHAN_HT20;
+                rx_channel_type = NL80211_CHAN_HT20;
                if (!(ap_ht_cap_flags & IEEE80211_HT_CAP_40MHZ_INTOLERANT) &&
                    !ieee80111_cfg_override_disables_ht40(sdata) &&
@@ -214,29 +225,28 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
                    (hti->ht_param & IEEE80211_HT_PARAM_CHAN_WIDTH_ANY)) {
                        switch(hti->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
                        case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
-                                if (!(local->hw.conf.channel->flags &
+                                rx_channel_type = NL80211_CHAN_HT40PLUS;
-                                    IEEE80211_CHAN_NO_HT40PLUS))
-                                        channel_type = NL80211_CHAN_HT40PLUS;
                                break;
                        case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
-                                if (!(local->hw.conf.channel->flags &
+                                rx_channel_type = NL80211_CHAN_HT40MINUS;
-                                    IEEE80211_CHAN_NO_HT40MINUS))
-                                        channel_type = NL80211_CHAN_HT40MINUS;
                                break;
                        }
                }
        }
+        tx_channel_type = ieee80211_get_tx_channel_type(local, rx_channel_type);
        if (local->tmp_channel)
-                local->tmp_channel_type = channel_type;
+                local->tmp_channel_type = rx_channel_type;
-        if (!ieee80211_set_channel_type(local, sdata, channel_type)) {
+        if (!ieee80211_set_channel_type(local, sdata, rx_channel_type)) {
                /* can only fail due to HT40+/- mismatch */
-                channel_type = NL80211_CHAN_HT20;
+                rx_channel_type = NL80211_CHAN_HT20;
-                WARN_ON(!ieee80211_set_channel_type(local, sdata, channel_type));
+                WARN_ON(!ieee80211_set_channel_type(local, sdata,
+                                                    rx_channel_type));
        }
-        if (beacon_htcap_ie && (prev_chantype != channel_type)) {
+        if (beacon_htcap_ie && (prev_chantype != rx_channel_type)) {
                /*
                 * Whenever the AP announces the HT mode change that can be
                 * 40MHz intolerant or etc., it would be safer to stop tx
@@ -254,13 +264,13 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
        /* channel_type change automatically detected */
        ieee80211_hw_config(local, 0);
-        if (prev_chantype != channel_type) {
+        if (prev_chantype != tx_channel_type) {
                rcu_read_lock();
                sta = sta_info_get(sdata, bssid);
                if (sta)
                        rate_control_rate_update(local, sband, sta,
                                                 IEEE80211_RC_HT_CHANGED,
-                                                 channel_type);
+                                                 tx_channel_type);
                rcu_read_unlock();
                if (beacon_htcap_ie)
@@ -273,7 +283,7 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
        /* if bss configuration changed store the new one */
        if (sdata->ht_opmode_valid != enable_ht ||
            sdata->vif.bss_conf.ht_operation_mode != ht_opmode ||
-            prev_chantype != channel_type) {
+            prev_chantype != rx_channel_type) {
                changed |= BSS_CHANGED_HT;
                sdata->vif.bss_conf.ht_operation_mode = ht_opmode;
                sdata->ht_opmode_valid = enable_ht;
@@ -284,48 +294,351 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
 /* frame sending functions */
-static void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata,
+static int ieee80211_compatible_rates(const u8 *supp_rates, int supp_rates_len,
-                                           const u8 *bssid, u16 stype, u16 reason,
+                                      struct ieee80211_supported_band *sband,
-                                           void *cookie, bool send_frame)
+                                      u32 *rates)
+{
+        int i, j, count;
+        *rates = 0;
+        count = 0;
+        for (i = 0; i < supp_rates_len; i++) {
+                int rate = (supp_rates[i] & 0x7F) * 5;
+                for (j = 0; j < sband->n_bitrates; j++)
+                        if (sband->bitrates[j].bitrate == rate) {
+                                *rates |= BIT(j);
+                                count++;
+                                break;
+                        }
+        }
+        return count;
+}
+static void ieee80211_add_ht_ie(struct ieee80211_sub_if_data *sdata,
+                                struct sk_buff *skb, const u8 *ht_info_ie,
+                                struct ieee80211_supported_band *sband,
+                                struct ieee80211_channel *channel,
+                                enum ieee80211_smps_mode smps)
+{
+        struct ieee80211_ht_info *ht_info;
+        u8 *pos;
+        u32 flags = channel->flags;
+        u16 cap;
+        struct ieee80211_sta_ht_cap ht_cap;
+        BUILD_BUG_ON(sizeof(ht_cap) != sizeof(sband->ht_cap));
+        if (!ht_info_ie)
+                return;
+        if (ht_info_ie[1] < sizeof(struct ieee80211_ht_info))
+                return;
+        memcpy(&ht_cap, &sband->ht_cap, sizeof(ht_cap));
+        ieee80211_apply_htcap_overrides(sdata, &ht_cap);
+        ht_info = (struct ieee80211_ht_info *)(ht_info_ie + 2);
+        /* determine capability flags */
+        cap = ht_cap.cap;
+        switch (ht_info->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
+        case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
+                if (flags & IEEE80211_CHAN_NO_HT40PLUS) {
+                        cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+                        cap &= ~IEEE80211_HT_CAP_SGI_40;
+                }
+                break;
+        case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
+                if (flags & IEEE80211_CHAN_NO_HT40MINUS) {
+                        cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+                        cap &= ~IEEE80211_HT_CAP_SGI_40;
+                }
+                break;
+        }
+        /* set SM PS mode properly */
+        cap &= ~IEEE80211_HT_CAP_SM_PS;
+        switch (smps) {
+        case IEEE80211_SMPS_AUTOMATIC:
+        case IEEE80211_SMPS_NUM_MODES:
+                WARN_ON(1);
+        case IEEE80211_SMPS_OFF:
+                cap |= WLAN_HT_CAP_SM_PS_DISABLED <<
+                        IEEE80211_HT_CAP_SM_PS_SHIFT;
+                break;
+        case IEEE80211_SMPS_STATIC:
+                cap |= WLAN_HT_CAP_SM_PS_STATIC <<
+                        IEEE80211_HT_CAP_SM_PS_SHIFT;
+                break;
+        case IEEE80211_SMPS_DYNAMIC:
+                cap |= WLAN_HT_CAP_SM_PS_DYNAMIC <<
+                        IEEE80211_HT_CAP_SM_PS_SHIFT;
+                break;
+        }
+        /* reserve and fill IE */
+        pos = skb_put(skb, sizeof(struct ieee80211_ht_cap) + 2);
+        ieee80211_ie_build_ht_cap(pos, &ht_cap, cap);
+}
+static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
 {
        struct ieee80211_local *local = sdata->local;
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+        struct ieee80211_mgd_assoc_data *assoc_data = ifmgd->assoc_data;
        struct sk_buff *skb;
        struct ieee80211_mgmt *mgmt;
+        u8 *pos, qos_info;
+        size_t offset = 0, noffset;
+        int i, count, rates_len, supp_rates_len;
+        u16 capab;
+        struct ieee80211_supported_band *sband;
+        u32 rates = 0;
+        lockdep_assert_held(&ifmgd->mtx);
+        sband = local->hw.wiphy->bands[local->oper_channel->band];
-        skb = dev_alloc_skb(local->hw.extra_tx_headroom + sizeof(*mgmt));
+        if (assoc_data->supp_rates_len) {
+                /*
+                 * Get all rates supported by the device and the AP as
+                 * some APs don't like getting a superset of their rates
+                 * in the association request (e.g. D-Link DAP 1353 in
+                 * b-only mode)...
+                 */
+                rates_len = ieee80211_compatible_rates(assoc_data->supp_rates,
+                                                       assoc_data->supp_rates_len,
+                                                       sband, &rates);
+        } else {
+                /*
+                 * In case AP not provide any supported rates information
+                 * before association, we send information element(s) with
+                 * all rates that we support.
+                 */
+                rates = ~0;
+                rates_len = sband->n_bitrates;
+        }
+        skb = alloc_skb(local->hw.extra_tx_headroom +
+                        sizeof(*mgmt) + /* bit too much but doesn't matter */
+                        2 + assoc_data->ssid_len + /* SSID */
+                        4 + rates_len + /* (extended) rates */
+                        4 + /* power capability */
+                        2 + 2 * sband->n_channels + /* supported channels */
+                        2 + sizeof(struct ieee80211_ht_cap) + /* HT */
+                        assoc_data->ie_len + /* extra IEs */
+                        9, /* WMM */
+                        GFP_KERNEL);
        if (!skb)
                return;
        skb_reserve(skb, local->hw.extra_tx_headroom);
+        capab = WLAN_CAPABILITY_ESS;
+        if (sband->band == IEEE80211_BAND_2GHZ) {
+                if (!(local->hw.flags & IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE))
+                        capab |= WLAN_CAPABILITY_SHORT_SLOT_TIME;
+                if (!(local->hw.flags & IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE))
+                        capab |= WLAN_CAPABILITY_SHORT_PREAMBLE;
+        }
+        if (assoc_data->capability & WLAN_CAPABILITY_PRIVACY)
+                capab |= WLAN_CAPABILITY_PRIVACY;
+        if ((assoc_data->capability & WLAN_CAPABILITY_SPECTRUM_MGMT) &&
+            (local->hw.flags & IEEE80211_HW_SPECTRUM_MGMT))
+                capab |= WLAN_CAPABILITY_SPECTRUM_MGMT;
        mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24);
        memset(mgmt, 0, 24);
+        memcpy(mgmt->da, assoc_data->bss->bssid, ETH_ALEN);
+        memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
+        memcpy(mgmt->bssid, assoc_data->bss->bssid, ETH_ALEN);
+        if (!is_zero_ether_addr(assoc_data->prev_bssid)) {
+                skb_put(skb, 10);
+                mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
+                                                  IEEE80211_STYPE_REASSOC_REQ);
+                mgmt->u.reassoc_req.capab_info = cpu_to_le16(capab);
+                mgmt->u.reassoc_req.listen_interval =
+                                cpu_to_le16(local->hw.conf.listen_interval);
+                memcpy(mgmt->u.reassoc_req.current_ap, assoc_data->prev_bssid,
+                       ETH_ALEN);
+        } else {
+                skb_put(skb, 4);
+                mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
+                                                  IEEE80211_STYPE_ASSOC_REQ);
+                mgmt->u.assoc_req.capab_info = cpu_to_le16(capab);
+                mgmt->u.assoc_req.listen_interval =
+                                cpu_to_le16(local->hw.conf.listen_interval);
+        }
+        /* SSID */
+        pos = skb_put(skb, 2 + assoc_data->ssid_len);
+        *pos++ = WLAN_EID_SSID;
+        *pos++ = assoc_data->ssid_len;
+        memcpy(pos, assoc_data->ssid, assoc_data->ssid_len);
+        /* add all rates which were marked to be used above */
+        supp_rates_len = rates_len;
+        if (supp_rates_len > 8)
+                supp_rates_len = 8;
+        pos = skb_put(skb, supp_rates_len + 2);
+        *pos++ = WLAN_EID_SUPP_RATES;
+        *pos++ = supp_rates_len;
+        count = 0;
+        for (i = 0; i < sband->n_bitrates; i++) {
+                if (BIT(i) & rates) {
+                        int rate = sband->bitrates[i].bitrate;
+                        *pos++ = (u8) (rate / 5);
+                        if (++count == 8)
+                                break;
+                }
+        }
+        if (rates_len > count) {
+                pos = skb_put(skb, rates_len - count + 2);
+                *pos++ = WLAN_EID_EXT_SUPP_RATES;
+                *pos++ = rates_len - count;
+                for (i++; i < sband->n_bitrates; i++) {
+                        if (BIT(i) & rates) {
+                                int rate = sband->bitrates[i].bitrate;
+                                *pos++ = (u8) (rate / 5);
+                        }
+                }
+        }
+        if (capab & WLAN_CAPABILITY_SPECTRUM_MGMT) {
+                /* 1. power capabilities */
+                pos = skb_put(skb, 4);
+                *pos++ = WLAN_EID_PWR_CAPABILITY;
+                *pos++ = 2;
+                *pos++ = 0; /* min tx power */
+                *pos++ = local->oper_channel->max_power; /* max tx power */
+                /* 2. supported channels */
+                /* TODO: get this in reg domain format */
+                pos = skb_put(skb, 2 * sband->n_channels + 2);
+                *pos++ = WLAN_EID_SUPPORTED_CHANNELS;
+                *pos++ = 2 * sband->n_channels;
+                for (i = 0; i < sband->n_channels; i++) {
+                        *pos++ = ieee80211_frequency_to_channel(
+                                        sband->channels[i].center_freq);
+                        *pos++ = 1; /* one channel in the subband*/
+                }
+        }
+        /* if present, add any custom IEs that go before HT */
+        if (assoc_data->ie_len && assoc_data->ie) {
+                static const u8 before_ht[] = {
+                        WLAN_EID_SSID,
+                        WLAN_EID_SUPP_RATES,
+                        WLAN_EID_EXT_SUPP_RATES,
+                        WLAN_EID_PWR_CAPABILITY,
+                        WLAN_EID_SUPPORTED_CHANNELS,
+                        WLAN_EID_RSN,
+                        WLAN_EID_QOS_CAPA,
+                        WLAN_EID_RRM_ENABLED_CAPABILITIES,
+                        WLAN_EID_MOBILITY_DOMAIN,
+                        WLAN_EID_SUPPORTED_REGULATORY_CLASSES,
+                };
+                noffset = ieee80211_ie_split(assoc_data->ie, assoc_data->ie_len,
+                                             before_ht, ARRAY_SIZE(before_ht),
+                                             offset);
+                pos = skb_put(skb, noffset - offset);
+                memcpy(pos, assoc_data->ie + offset, noffset - offset);
+                offset = noffset;
+        }
+        if (!(ifmgd->flags & IEEE80211_STA_DISABLE_11N))
+                ieee80211_add_ht_ie(sdata, skb, assoc_data->ht_information_ie,
+                                    sband, local->oper_channel, ifmgd->ap_smps);
+        /* if present, add any custom non-vendor IEs that go after HT */
+        if (assoc_data->ie_len && assoc_data->ie) {
+                noffset = ieee80211_ie_split_vendor(assoc_data->ie,
+                                                    assoc_data->ie_len,
+                                                    offset);
+                pos = skb_put(skb, noffset - offset);
+                memcpy(pos, assoc_data->ie + offset, noffset - offset);
+                offset = noffset;
+        }
+        if (assoc_data->wmm) {
+                if (assoc_data->uapsd) {
+                        qos_info = ifmgd->uapsd_queues;
+                        qos_info |= (ifmgd->uapsd_max_sp_len <<
+                                     IEEE80211_WMM_IE_STA_QOSINFO_SP_SHIFT);
+                } else {
+                        qos_info = 0;
+                }
+                pos = skb_put(skb, 9);
+                *pos++ = WLAN_EID_VENDOR_SPECIFIC;
+                *pos++ = 7; /* len */
+                *pos++ = 0x00; /* Microsoft OUI 00:50:F2 */
+                *pos++ = 0x50;
+                *pos++ = 0xf2;
+                *pos++ = 2; /* WME */
+                *pos++ = 0; /* WME info */
+                *pos++ = 1; /* WME ver */
+                *pos++ = qos_info;
+        }
+        /* add any remaining custom (i.e. vendor specific here) IEs */
+        if (assoc_data->ie_len && assoc_data->ie) {
+                noffset = assoc_data->ie_len;
+                pos = skb_put(skb, noffset - offset);
+                memcpy(pos, assoc_data->ie + offset, noffset - offset);
+        }
+        IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
+        ieee80211_tx_skb(sdata, skb);
+}
+static void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata,
+                                           const u8 *bssid, u16 stype,
+                                           u16 reason, bool send_frame,
+                                           u8 *frame_buf)
+{
+        struct ieee80211_local *local = sdata->local;
+        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+        struct sk_buff *skb;
+        struct ieee80211_mgmt *mgmt = (void *)frame_buf;
+        /* build frame */
+        mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | stype);
+        mgmt->duration = 0; /* initialize only */
+        mgmt->seq_ctrl = 0; /* initialize only */
        memcpy(mgmt->da, bssid, ETH_ALEN);
        memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
        memcpy(mgmt->bssid, bssid, ETH_ALEN);
-        mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | stype);
-        skb_put(skb, 2);
        /* u.deauth.reason_code == u.disassoc.reason_code */
        mgmt->u.deauth.reason_code = cpu_to_le16(reason);
-        if (stype == IEEE80211_STYPE_DEAUTH)
+        if (send_frame) {
-                if (cookie)
+                skb = dev_alloc_skb(local->hw.extra_tx_headroom +
-                        __cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len);
+                                    DEAUTH_DISASSOC_LEN);
-                else
+                if (!skb)
-                        cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len);
+                        return;
-        else
-                if (cookie)
-                        __cfg80211_send_disassoc(sdata->dev, (u8 *)mgmt, skb->len);
-                else
-                        cfg80211_send_disassoc(sdata->dev, (u8 *)mgmt, skb->len);
-        if (!(ifmgd->flags & IEEE80211_STA_MFP_ENABLED))
-                IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
-        if (send_frame)
+                skb_reserve(skb, local->hw.extra_tx_headroom);
+                /* copy in frame */
+                memcpy(skb_put(skb, DEAUTH_DISASSOC_LEN),
+                       mgmt, DEAUTH_DISASSOC_LEN);
+                if (!(ifmgd->flags & IEEE80211_STA_MFP_ENABLED))
+                        IEEE80211_SKB_CB(skb)->flags |=
+                                IEEE80211_TX_INTFL_DONT_ENCRYPT;
                ieee80211_tx_skb(sdata, skb);
-        else
+        }
-                kfree_skb(skb);
 }
 void ieee80211_send_pspoll(struct ieee80211_local *local,
@@ -547,7 +860,7 @@ static void ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata,
        if (pwr_constr_elem_len != 1)
                return;
-        if ((*pwr_constr_elem <= conf->channel->max_power) &&
+        if ((*pwr_constr_elem <= conf->channel->max_reg_power) &&
            (*pwr_constr_elem != sdata->local->power_constr_level)) {
                sdata->local->power_constr_level = *pwr_constr_elem;
                ieee80211_hw_config(sdata->local, 0);
@@ -879,7 +1192,7 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
                return;
        if (ifmgd->flags & IEEE80211_STA_UAPSD_ENABLED)
-                uapsd_queues = local->uapsd_queues;
+                uapsd_queues = ifmgd->uapsd_queues;
        count = wmm_param[6] & 0x0f;
        if (count == ifmgd->wmm_last_param_set)
@@ -953,7 +1266,6 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
        /* enable WMM or activate new settings */
        sdata->vif.bss_conf.qos = true;
-        ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_QOS);
 }
 static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata,
@@ -1006,7 +1318,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
        bss_info_changed |= BSS_CHANGED_ASSOC;
        /* set timing information */
        bss_conf->beacon_int = cbss->beacon_interval;
-        bss_conf->timestamp = cbss->tsf;
+        bss_conf->last_tsf = cbss->tsf;
        bss_info_changed |= BSS_CHANGED_BEACON_INT;
        bss_info_changed |= ieee80211_handle_bss_capability(sdata,
@@ -1032,18 +1344,9 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
                bss_conf->dtim_period = 0;
        bss_conf->assoc = 1;
-        /*
-         * For now just always ask the driver to update the basic rateset
-         * when we have associated, we aren't checking whether it actually
-         * changed or not.
-         */
-        bss_info_changed |= BSS_CHANGED_BASIC_RATES;
-        /* And the BSSID changed - we're associated now */
-        bss_info_changed |= BSS_CHANGED_BSSID;
        /* Tell the driver to monitor connection quality (if supported) */
-        if ((local->hw.flags & IEEE80211_HW_SUPPORTS_CQM_RSSI) &&
+        if (sdata->vif.driver_flags & IEEE80211_VIF_SUPPORTS_CQM_RSSI &&
            bss_conf->cqm_rssi_thold)
                bss_info_changed |= BSS_CHANGED_CQM;
@@ -1065,16 +1368,20 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
 }
 static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
-                                   bool remove_sta, bool tx)
+                                   u16 stype, u16 reason, bool tx,
+                                   u8 *frame_buf)
 {
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
        struct ieee80211_local *local = sdata->local;
        struct sta_info *sta;
-        u32 changed = 0, config_changed = 0;
+        u32 changed = 0;
        u8 bssid[ETH_ALEN];
        ASSERT_MGD_MTX(ifmgd);
+        if (WARN_ON_ONCE(tx && !frame_buf))
+                return;
        if (WARN_ON(!ifmgd->associated))
                return;
@@ -1108,17 +1415,25 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
        }
        mutex_unlock(&local->sta_mtx);
+        /* deauthenticate/disassociate now */
+        if (tx || frame_buf)
+                ieee80211_send_deauth_disassoc(sdata, bssid, stype, reason,
+                                               tx, frame_buf);
+        /* flush out frame */
+        if (tx)
+                drv_flush(local, false);
+        /* remove AP and TDLS peers */
+        sta_info_flush(local, sdata);
+        /* finally reset all BSS / config parameters */
        changed |= ieee80211_reset_erp_info(sdata);
        ieee80211_led_assoc(local, 0);
        changed |= BSS_CHANGED_ASSOC;
        sdata->vif.bss_conf.assoc = false;
-        ieee80211_set_wmm_default(sdata);
-        /* channel(_type) changes are handled by ieee80211_hw_config */
-        WARN_ON(!ieee80211_set_channel_type(local, sdata, NL80211_CHAN_NO_HT));
        /* on the next assoc, re-program HT parameters */
        sdata->ht_opmode_valid = false;
        memset(&ifmgd->ht_capa, 0, sizeof(ifmgd->ht_capa));
@@ -1131,25 +1446,29 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
        if (local->hw.conf.flags & IEEE80211_CONF_PS) {
                local->hw.conf.flags &= ~IEEE80211_CONF_PS;
-                config_changed |= IEEE80211_CONF_CHANGE_PS;
+                ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
        }
        local->ps_sdata = NULL;
-        ieee80211_hw_config(local, config_changed);
        /* Disable ARP filtering */
        if (sdata->vif.bss_conf.arp_filter_enabled) {
                sdata->vif.bss_conf.arp_filter_enabled = false;
                changed |= BSS_CHANGED_ARP_FILTER;
        }
+        sdata->vif.bss_conf.qos = false;
+        changed |= BSS_CHANGED_QOS;
        /* The BSSID (not really interesting) and HT changed */
        changed |= BSS_CHANGED_BSSID | BSS_CHANGED_HT;
        ieee80211_bss_info_change_notify(sdata, changed);
-        /* remove AP and TDLS peers */
+        /* channel(_type) changes are handled by ieee80211_hw_config */
-        if (remove_sta)
+        WARN_ON(!ieee80211_set_channel_type(local, sdata, NL80211_CHAN_NO_HT));
-                sta_info_flush(local, sdata);
+        ieee80211_hw_config(local, 0);
+        /* disassociated - set to defaults now */
+        ieee80211_set_wmm_default(sdata, false);
        del_timer_sync(&sdata->u.mgd.conn_mon_timer);
        del_timer_sync(&sdata->u.mgd.bcn_mon_timer);
@@ -1347,6 +1666,7 @@ static void __ieee80211_connection_loss(struct ieee80211_sub_if_data *sdata)
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
        struct ieee80211_local *local = sdata->local;
        u8 bssid[ETH_ALEN];
+        u8 frame_buf[DEAUTH_DISASSOC_LEN];
        mutex_lock(&ifmgd->mtx);
        if (!ifmgd->associated) {
@@ -1359,17 +1679,16 @@ static void __ieee80211_connection_loss(struct ieee80211_sub_if_data *sdata)
        printk(KERN_DEBUG "%s: Connection to AP %pM lost.\n",
               sdata->name, bssid);
-        ieee80211_set_disassoc(sdata, true, true);
+        ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
+                               WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY,
+                               false, frame_buf);
        mutex_unlock(&ifmgd->mtx);
        /*
         * must be outside lock due to cfg80211,
         * but that's not a problem.
         */
-        ieee80211_send_deauth_disassoc(sdata, bssid,
+        cfg80211_send_deauth(sdata->dev, frame_buf, DEAUTH_DISASSOC_LEN);
-                                       IEEE80211_STYPE_DEAUTH,
-                                       WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY,
-                                       NULL, true);
        mutex_lock(&local->mtx);
        ieee80211_recalc_idle(local);
@@ -1423,6 +1742,126 @@ void ieee80211_connection_loss(struct ieee80211_vif *vif)
 EXPORT_SYMBOL(ieee80211_connection_loss);
+static void ieee80211_destroy_auth_data(struct ieee80211_sub_if_data *sdata,
+                                        bool assoc)
+{
+        struct ieee80211_mgd_auth_data *auth_data = sdata->u.mgd.auth_data;
+        lockdep_assert_held(&sdata->u.mgd.mtx);
+        if (!assoc) {
+                sta_info_destroy_addr(sdata, auth_data->bss->bssid);
+                memset(sdata->u.mgd.bssid, 0, ETH_ALEN);
+                ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID);
+        }
+        cfg80211_put_bss(auth_data->bss);
+        kfree(auth_data);
+        sdata->u.mgd.auth_data = NULL;
+}
+static void ieee80211_auth_challenge(struct ieee80211_sub_if_data *sdata,
+                                     struct ieee80211_mgmt *mgmt, size_t len)
+{
+        struct ieee80211_mgd_auth_data *auth_data = sdata->u.mgd.auth_data;
+        u8 *pos;
+        struct ieee802_11_elems elems;
+        pos = mgmt->u.auth.variable;
+        ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
+        if (!elems.challenge)
+                return;
+        auth_data->expected_transaction = 4;
+        ieee80211_send_auth(sdata, 3, auth_data->algorithm,
+                            elems.challenge - 2, elems.challenge_len + 2,
+                            auth_data->bss->bssid, auth_data->bss->bssid,
+                            auth_data->key, auth_data->key_len,
+                            auth_data->key_idx);
+}
+static enum rx_mgmt_action __must_check
+ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
+                       struct ieee80211_mgmt *mgmt, size_t len)
+{
+        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+        u8 bssid[ETH_ALEN];
+        u16 auth_alg, auth_transaction, status_code;
+        struct sta_info *sta;
+        lockdep_assert_held(&ifmgd->mtx);
+        if (len < 24 + 6)
+                return RX_MGMT_NONE;
+        if (!ifmgd->auth_data || ifmgd->auth_data->done)
+                return RX_MGMT_NONE;
+        memcpy(bssid, ifmgd->auth_data->bss->bssid, ETH_ALEN);
+        if (compare_ether_addr(bssid, mgmt->bssid))
+                return RX_MGMT_NONE;
+        auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);
+        auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);
+        status_code = le16_to_cpu(mgmt->u.auth.status_code);
+        if (auth_alg != ifmgd->auth_data->algorithm ||
+            auth_transaction != ifmgd->auth_data->expected_transaction)
+                return RX_MGMT_NONE;
+        if (status_code != WLAN_STATUS_SUCCESS) {
+                printk(KERN_DEBUG "%s: %pM denied authentication (status %d)\n",
+                       sdata->name, mgmt->sa, status_code);
+                goto out;
+        }
+        switch (ifmgd->auth_data->algorithm) {
+        case WLAN_AUTH_OPEN:
+        case WLAN_AUTH_LEAP:
+        case WLAN_AUTH_FT:
+                break;
+        case WLAN_AUTH_SHARED_KEY:
+                if (ifmgd->auth_data->expected_transaction != 4) {
+                        ieee80211_auth_challenge(sdata, mgmt, len);
+                        /* need another frame */
+                        return RX_MGMT_NONE;
+                }
+                break;
+        default:
+                WARN_ONCE(1, "invalid auth alg %d",
+                          ifmgd->auth_data->algorithm);
+                return RX_MGMT_NONE;
+        }
+        printk(KERN_DEBUG "%s: authenticated\n", sdata->name);
+ out:
+        ifmgd->auth_data->done = true;
+        ifmgd->auth_data->timeout = jiffies + IEEE80211_AUTH_WAIT_ASSOC;
+        run_again(ifmgd, ifmgd->auth_data->timeout);
+        /* move station state to auth */
+        mutex_lock(&sdata->local->sta_mtx);
+        sta = sta_info_get(sdata, bssid);
+        if (!sta) {
+                WARN_ONCE(1, "%s: STA %pM not found", sdata->name, bssid);
+                goto out_err;
+        }
+        if (sta_info_move_state(sta, IEEE80211_STA_AUTH)) {
+                printk(KERN_DEBUG "%s: failed moving %pM to auth\n",
+                       sdata->name, bssid);
+                goto out_err;
+        }
+        mutex_unlock(&sdata->local->sta_mtx);
+        return RX_MGMT_CFG80211_RX_AUTH;
+ out_err:
+        mutex_unlock(&sdata->local->sta_mtx);
+        /* ignore frame -- wait for timeout */
+        return RX_MGMT_NONE;
+}
 static enum rx_mgmt_action __must_check
 ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
                         struct ieee80211_mgmt *mgmt, size_t len)
@@ -1431,10 +1870,14 @@ ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
        const u8 *bssid = NULL;
        u16 reason_code;
+        lockdep_assert_held(&ifmgd->mtx);
        if (len < 24 + 2)
                return RX_MGMT_NONE;
-        ASSERT_MGD_MTX(ifmgd);
+        if (!ifmgd->associated ||
+            compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid))
+                return RX_MGMT_NONE;
        bssid = ifmgd->associated->bssid;
@@ -1443,7 +1886,8 @@ ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
        printk(KERN_DEBUG "%s: deauthenticated from %pM (Reason: %u)\n",
                        sdata->name, bssid, reason_code);
-        ieee80211_set_disassoc(sdata, true, false);
+        ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
        mutex_lock(&sdata->local->mtx);
        ieee80211_recalc_idle(sdata->local);
        mutex_unlock(&sdata->local->mtx);
@@ -1459,15 +1903,13 @@ ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
        u16 reason_code;
-        if (len < 24 + 2)
+        lockdep_assert_held(&ifmgd->mtx);
-                return RX_MGMT_NONE;
-        ASSERT_MGD_MTX(ifmgd);
-        if (WARN_ON(!ifmgd->associated))
+        if (len < 24 + 2)
                return RX_MGMT_NONE;
-        if (WARN_ON(memcmp(ifmgd->associated->bssid, mgmt->sa, ETH_ALEN)))
+        if (!ifmgd->associated ||
+            compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid))
                return RX_MGMT_NONE;
        reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
@@ -1475,10 +1917,12 @@ ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
        printk(KERN_DEBUG "%s: disassociated from %pM (Reason: %u)\n",
                        sdata->name, mgmt->sa, reason_code);
-        ieee80211_set_disassoc(sdata, true, false);
+        ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
        mutex_lock(&sdata->local->mtx);
        ieee80211_recalc_idle(sdata->local);
        mutex_unlock(&sdata->local->mtx);
        return RX_MGMT_CFG80211_DISASSOC;
 }
@@ -1524,25 +1968,39 @@ static void ieee80211_get_rates(struct ieee80211_supported_band *sband,
        }
 }
-static bool ieee80211_assoc_success(struct ieee80211_work *wk,
+static void ieee80211_destroy_assoc_data(struct ieee80211_sub_if_data *sdata,
+                                         bool assoc)
+{
+        struct ieee80211_mgd_assoc_data *assoc_data = sdata->u.mgd.assoc_data;
+        lockdep_assert_held(&sdata->u.mgd.mtx);
+        if (!assoc) {
+                sta_info_destroy_addr(sdata, assoc_data->bss->bssid);
+                memset(sdata->u.mgd.bssid, 0, ETH_ALEN);
+                ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID);
+        }
+        kfree(assoc_data);
+        sdata->u.mgd.assoc_data = NULL;
+}
+static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
+                                    struct cfg80211_bss *cbss,
                                    struct ieee80211_mgmt *mgmt, size_t len)
 {
-        struct ieee80211_sub_if_data *sdata = wk->sdata;
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
        struct ieee80211_local *local = sdata->local;
        struct ieee80211_supported_band *sband;
        struct sta_info *sta;
-        struct cfg80211_bss *cbss = wk->assoc.bss;
        u8 *pos;
-        u32 rates, basic_rates;
        u16 capab_info, aid;
        struct ieee802_11_elems elems;
        struct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf;
        u32 changed = 0;
        int err;
-        bool have_higher_than_11mbit = false;
        u16 ap_ht_cap_flags;
-        int min_rate = INT_MAX, min_rate_index = -1;
        /* AssocResp and ReassocResp have identical structure */
@@ -1581,49 +2039,13 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk,
         * station info was already allocated and inserted before
         * the association and should be available to us
         */
-        sta = sta_info_get_rx(sdata, cbss->bssid);
+        sta = sta_info_get(sdata, cbss->bssid);
        if (WARN_ON(!sta)) {
                mutex_unlock(&sdata->local->sta_mtx);
                return false;
        }
-        sta_info_move_state(sta, IEEE80211_STA_AUTH);
+        sband = local->hw.wiphy->bands[local->oper_channel->band];
-        sta_info_move_state(sta, IEEE80211_STA_ASSOC);
-        if (!(ifmgd->flags & IEEE80211_STA_CONTROL_PORT))
-                sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
-        rates = 0;
-        basic_rates = 0;
-        sband = local->hw.wiphy->bands[wk->chan->band];
-        ieee80211_get_rates(sband, elems.supp_rates, elems.supp_rates_len,
-                            &rates, &basic_rates, &have_higher_than_11mbit,
-                            &min_rate, &min_rate_index);
-        ieee80211_get_rates(sband, elems.ext_supp_rates,
-                            elems.ext_supp_rates_len, &rates, &basic_rates,
-                            &have_higher_than_11mbit,
-                            &min_rate, &min_rate_index);
-        /*
-         * some buggy APs don't advertise basic_rates. use the lowest
-         * supported rate instead.
-         */
-        if (unlikely(!basic_rates) && min_rate_index >= 0) {
-                printk(KERN_DEBUG "%s: No basic rates in AssocResp. "
-                       "Using min supported rate instead.\n", sdata->name);
-                basic_rates = BIT(min_rate_index);
-        }
-        sta->sta.supp_rates[wk->chan->band] = rates;
-        sdata->vif.bss_conf.basic_rates = basic_rates;
-        /* cf. IEEE 802.11 9.2.12 */
-        if (wk->chan->band == IEEE80211_BAND_2GHZ &&
-            have_higher_than_11mbit)
-                sdata->flags |= IEEE80211_SDATA_OPERATING_GMODE;
-        else
-                sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE;
        if (elems.ht_cap_elem && !(ifmgd->flags & IEEE80211_STA_DISABLE_11N))
                ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
@@ -1639,15 +2061,22 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk,
        if (elems.wmm_param)
                set_sta_flag(sta, WLAN_STA_WME);
-        /* sta_info_reinsert will also unlock the mutex lock */
+        err = sta_info_move_state(sta, IEEE80211_STA_AUTH);
-        err = sta_info_reinsert(sta);
+        if (!err)
-        sta = NULL;
+                err = sta_info_move_state(sta, IEEE80211_STA_ASSOC);
+        if (!err && !(ifmgd->flags & IEEE80211_STA_CONTROL_PORT))
+                err = sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
        if (err) {
-                printk(KERN_DEBUG "%s: failed to insert STA entry for"
+                printk(KERN_DEBUG
-                       " the AP (error %d)\n", sdata->name, err);
+                       "%s: failed to move station %pM to desired state\n",
+                       sdata->name, sta->sta.addr);
+                WARN_ON(__sta_info_destroy(sta));
+                mutex_unlock(&sdata->local->sta_mtx);
                return false;
        }
+        mutex_unlock(&sdata->local->sta_mtx);
        /*
         * Always handle WMM once after association regardless
         * of the first value the AP uses. Setting -1 here has
@@ -1660,12 +2089,10 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk,
                ieee80211_sta_wmm_params(local, sdata, elems.wmm_param,
                                         elems.wmm_param_len);
        else
-                ieee80211_set_wmm_default(sdata);
+                ieee80211_set_wmm_default(sdata, false);
+        changed |= BSS_CHANGED_QOS;
-        local->oper_channel = wk->chan;
        if (elems.ht_info_elem && elems.wmm_param &&
-            (sdata->local->hw.queues >= 4) &&
            !(ifmgd->flags & IEEE80211_STA_DISABLE_11N))
                changed |= ieee80211_enable_ht(sdata, elems.ht_info_elem,
                                               cbss->bssid, ap_ht_cap_flags,
@@ -1694,7 +2121,88 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk,
        return true;
 }
+static enum rx_mgmt_action __must_check
+ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
+                             struct ieee80211_mgmt *mgmt, size_t len,
+                             struct cfg80211_bss **bss)
+{
+        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+        struct ieee80211_mgd_assoc_data *assoc_data = ifmgd->assoc_data;
+        u16 capab_info, status_code, aid;
+        struct ieee802_11_elems elems;
+        u8 *pos;
+        bool reassoc;
+        lockdep_assert_held(&ifmgd->mtx);
+        if (!assoc_data)
+                return RX_MGMT_NONE;
+        if (compare_ether_addr(assoc_data->bss->bssid, mgmt->bssid))
+                return RX_MGMT_NONE;
+        /*
+         * AssocResp and ReassocResp have identical structure, so process both
+         * of them in this function.
+         */
+        if (len < 24 + 6)
+                return RX_MGMT_NONE;
+        reassoc = ieee80211_is_reassoc_req(mgmt->frame_control);
+        capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info);
+        status_code = le16_to_cpu(mgmt->u.assoc_resp.status_code);
+        aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
+        printk(KERN_DEBUG "%s: RX %sssocResp from %pM (capab=0x%x "
+               "status=%d aid=%d)\n",
+               sdata->name, reassoc ? "Rea" : "A", mgmt->sa,
+               capab_info, status_code, (u16)(aid & ~(BIT(15) | BIT(14))));
+        pos = mgmt->u.assoc_resp.variable;
+        ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
+        if (status_code == WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY &&
+            elems.timeout_int && elems.timeout_int_len == 5 &&
+            elems.timeout_int[0] == WLAN_TIMEOUT_ASSOC_COMEBACK) {
+                u32 tu, ms;
+                tu = get_unaligned_le32(elems.timeout_int + 1);
+                ms = tu * 1024 / 1000;
+                printk(KERN_DEBUG "%s: %pM rejected association temporarily; "
+                       "comeback duration %u TU (%u ms)\n",
+                       sdata->name, mgmt->sa, tu, ms);
+                assoc_data->timeout = jiffies + msecs_to_jiffies(ms);
+                if (ms > IEEE80211_ASSOC_TIMEOUT)
+                        run_again(ifmgd, assoc_data->timeout);
+                return RX_MGMT_NONE;
+        }
+        *bss = assoc_data->bss;
+        if (status_code != WLAN_STATUS_SUCCESS) {
+                printk(KERN_DEBUG "%s: %pM denied association (code=%d)\n",
+                       sdata->name, mgmt->sa, status_code);
+                ieee80211_destroy_assoc_data(sdata, false);
+        } else {
+                printk(KERN_DEBUG "%s: associated\n", sdata->name);
+                if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) {
+                        /* oops -- internal error -- send timeout for now */
+                        ieee80211_destroy_assoc_data(sdata, true);
+                        sta_info_destroy_addr(sdata, mgmt->bssid);
+                        cfg80211_put_bss(*bss);
+                        return RX_MGMT_CFG80211_ASSOC_TIMEOUT;
+                }
+                /*
+                 * destroy assoc_data afterwards, as otherwise an idle
+                 * recalc after assoc_data is NULL but before associated
+                 * is set can cause the interface to go idle
+                 */
+                ieee80211_destroy_assoc_data(sdata, true);
+        }
+        return RX_MGMT_CFG80211_RX_ASSOC;
+}
 static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                                  struct ieee80211_mgmt *mgmt,
                                  size_t len,
@@ -1708,7 +2216,9 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
        struct ieee80211_channel *channel;
        bool need_ps = false;
-        if (sdata->u.mgd.associated) {
+        if (sdata->u.mgd.associated &&
+            compare_ether_addr(mgmt->bssid, sdata->u.mgd.associated->bssid)
+            == 0) {
                bss = (void *)sdata->u.mgd.associated->priv;
                /* not previously set so we may need to recalc */
                need_ps = !bss->dtim_period;
@@ -1763,7 +2273,7 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
        ASSERT_MGD_MTX(ifmgd);
-        if (memcmp(mgmt->da, sdata->vif.addr, ETH_ALEN))
+        if (compare_ether_addr(mgmt->da, sdata->vif.addr))
                return; /* ignore ProbeResp to foreign address */
        baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
@@ -1776,8 +2286,18 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
        ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems, false);
        if (ifmgd->associated &&
-            memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN) == 0)
+            compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid) == 0)
                ieee80211_reset_ap_probe(sdata);
+        if (ifmgd->auth_data && !ifmgd->auth_data->bss->proberesp_ies &&
+            compare_ether_addr(mgmt->bssid, ifmgd->auth_data->bss->bssid)
+            == 0) {
+                /* got probe response, continue with auth */
+                printk(KERN_DEBUG "%s: direct probe responded\n", sdata->name);
+                ifmgd->auth_data->tries = 0;
+                ifmgd->auth_data->timeout = jiffies;
+                run_again(ifmgd, ifmgd->auth_data->timeout);
+        }
 }
 /*
@@ -1817,7 +2337,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
        u32 ncrc;
        u8 *bssid;
-        ASSERT_MGD_MTX(ifmgd);
+        lockdep_assert_held(&ifmgd->mtx);
        /* Process beacon from the current BSS */
        baselen = (u8 *) mgmt->u.beacon.variable - (u8 *) mgmt;
@@ -1827,21 +2347,26 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
        if (rx_status->freq != local->hw.conf.channel->center_freq)
                return;
-        /*
+        if (ifmgd->assoc_data && !ifmgd->assoc_data->have_beacon &&
-         * We might have received a number of frames, among them a
+            compare_ether_addr(mgmt->bssid, ifmgd->assoc_data->bss->bssid)
-         * disassoc frame and a beacon...
+            == 0) {
-         */
+                ieee802_11_parse_elems(mgmt->u.beacon.variable,
-        if (!ifmgd->associated)
+                                       len - baselen, &elems);
-                return;
-        bssid = ifmgd->associated->bssid;
+                ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems,
+                                      false);
+                ifmgd->assoc_data->have_beacon = true;
+                ifmgd->assoc_data->sent_assoc = false;
+                /* continue assoc process */
+                ifmgd->assoc_data->timeout = jiffies;
+                run_again(ifmgd, ifmgd->assoc_data->timeout);
+                return;
+        }
-        /*
+        if (!ifmgd->associated ||
-         * And in theory even frames from a different AP we were just
+            compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid))
-         * associated to a split-second ago!
-         */
-        if (memcmp(bssid, mgmt->bssid, ETH_ALEN) != 0)
                return;
+        bssid = ifmgd->associated->bssid;
        /* Track average RSSI from the Beacon frames of the current AP */
        ifmgd->last_beacon_signal = rx_status->signal;
@@ -1882,7 +2407,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
        if (bss_conf->cqm_rssi_thold &&
            ifmgd->count_beacon_signal >= IEEE80211_SIGNAL_AVE_MIN_COUNT &&
-            !(local->hw.flags & IEEE80211_HW_SUPPORTS_CQM_RSSI)) {
+            !(sdata->vif.driver_flags & IEEE80211_VIF_SUPPORTS_CQM_RSSI)) {
                int sig = ifmgd->ave_beacon_signal / 16;
                int last_event = ifmgd->last_cqm_event_signal;
                int thold = bss_conf->cqm_rssi_thold;
@@ -2025,6 +2550,7 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
        struct ieee80211_rx_status *rx_status;
        struct ieee80211_mgmt *mgmt;
+        struct cfg80211_bss *bss = NULL;
        enum rx_mgmt_action rma = RX_MGMT_NONE;
        u16 fc;
@@ -2034,92 +2560,59 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
        mutex_lock(&ifmgd->mtx);
-        if (ifmgd->associated &&
+        switch (fc & IEEE80211_FCTL_STYPE) {
-            memcmp(ifmgd->associated->bssid, mgmt->bssid, ETH_ALEN) == 0) {
+        case IEEE80211_STYPE_BEACON:
-                switch (fc & IEEE80211_FCTL_STYPE) {
+                ieee80211_rx_mgmt_beacon(sdata, mgmt, skb->len, rx_status);
-                case IEEE80211_STYPE_BEACON:
+                break;
-                        ieee80211_rx_mgmt_beacon(sdata, mgmt, skb->len,
+        case IEEE80211_STYPE_PROBE_RESP:
-                                                 rx_status);
+                ieee80211_rx_mgmt_probe_resp(sdata, skb);
-                        break;
+                break;
-                case IEEE80211_STYPE_PROBE_RESP:
+        case IEEE80211_STYPE_AUTH:
-                        ieee80211_rx_mgmt_probe_resp(sdata, skb);
+                rma = ieee80211_rx_mgmt_auth(sdata, mgmt, skb->len);
-                        break;
+                break;
-                case IEEE80211_STYPE_DEAUTH:
+        case IEEE80211_STYPE_DEAUTH:
-                        rma = ieee80211_rx_mgmt_deauth(sdata, mgmt, skb->len);
+                rma = ieee80211_rx_mgmt_deauth(sdata, mgmt, skb->len);
-                        break;
+                break;
-                case IEEE80211_STYPE_DISASSOC:
+        case IEEE80211_STYPE_DISASSOC:
-                        rma = ieee80211_rx_mgmt_disassoc(sdata, mgmt, skb->len);
+                rma = ieee80211_rx_mgmt_disassoc(sdata, mgmt, skb->len);
-                        break;
+                break;
-                case IEEE80211_STYPE_ACTION:
+        case IEEE80211_STYPE_ASSOC_RESP:
-                        switch (mgmt->u.action.category) {
+        case IEEE80211_STYPE_REASSOC_RESP:
-                        case WLAN_CATEGORY_SPECTRUM_MGMT:
+                rma = ieee80211_rx_mgmt_assoc_resp(sdata, mgmt, skb->len, &bss);
-                                ieee80211_sta_process_chanswitch(sdata,
+                break;
-                                                &mgmt->u.action.u.chan_switch.sw_elem,
+        case IEEE80211_STYPE_ACTION:
-                                                (void *)ifmgd->associated->priv,
+                switch (mgmt->u.action.category) {
-                                                rx_status->mactime);
+                case WLAN_CATEGORY_SPECTRUM_MGMT:
-                                break;
+                        ieee80211_sta_process_chanswitch(sdata,
-                        }
+                                        &mgmt->u.action.u.chan_switch.sw_elem,
-                }
+                                        (void *)ifmgd->associated->priv,
-                mutex_unlock(&ifmgd->mtx);
+                                        rx_status->mactime);
-                switch (rma) {
-                case RX_MGMT_NONE:
-                        /* no action */
-                        break;
-                case RX_MGMT_CFG80211_DEAUTH:
-                        cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len);
-                        break;
-                case RX_MGMT_CFG80211_DISASSOC:
-                        cfg80211_send_disassoc(sdata->dev, (u8 *)mgmt, skb->len);
                        break;
-                default:
-                        WARN(1, "unexpected: %d", rma);
                }
-                return;
        }
        mutex_unlock(&ifmgd->mtx);
-        if (skb->len >= 24 + 2 /* mgmt + deauth reason */ &&
+        switch (rma) {
-            (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH) {
+        case RX_MGMT_NONE:
-                struct ieee80211_local *local = sdata->local;
+                /* no action */
-                struct ieee80211_work *wk;
+                break;
+        case RX_MGMT_CFG80211_DEAUTH:
-                mutex_lock(&local->mtx);
-                list_for_each_entry(wk, &local->work_list, list) {
-                        if (wk->sdata != sdata)
-                                continue;
-                        if (wk->type != IEEE80211_WORK_ASSOC &&
-                            wk->type != IEEE80211_WORK_ASSOC_BEACON_WAIT)
-                                continue;
-                        if (memcmp(mgmt->bssid, wk->filter_ta, ETH_ALEN))
-                                continue;
-                        if (memcmp(mgmt->sa, wk->filter_ta, ETH_ALEN))
-                                continue;
-                        /*
-                         * Printing the message only here means we can't
-                         * spuriously print it, but it also means that it
-                         * won't be printed when the frame comes in before
-                         * we even tried to associate or in similar cases.
-                         *
-                         * Ultimately, I suspect cfg80211 should print the
-                         * messages instead.
-                         */
-                        printk(KERN_DEBUG
-                               "%s: deauthenticated from %pM (Reason: %u)\n",
-                               sdata->name, mgmt->bssid,
-                               le16_to_cpu(mgmt->u.deauth.reason_code));
-                        list_del_rcu(&wk->list);
-                        free_work(wk);
-                        break;
-                }
-                mutex_unlock(&local->mtx);
                cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len);
+                break;
+        case RX_MGMT_CFG80211_DISASSOC:
+                cfg80211_send_disassoc(sdata->dev, (u8 *)mgmt, skb->len);
+                break;
+        case RX_MGMT_CFG80211_RX_AUTH:
+                cfg80211_send_rx_auth(sdata->dev, (u8 *)mgmt, skb->len);
+                break;
+        case RX_MGMT_CFG80211_RX_ASSOC:
+                cfg80211_send_rx_assoc(sdata->dev, bss, (u8 *)mgmt, skb->len);
+                break;
+        case RX_MGMT_CFG80211_ASSOC_TIMEOUT:
+                cfg80211_send_assoc_timeout(sdata->dev, mgmt->bssid);
+                break;
+        default:
+                WARN(1, "unexpected: %d", rma);
        }
 }
@@ -2143,19 +2636,20 @@ static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata,
 {
        struct ieee80211_local *local = sdata->local;
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+        u8 frame_buf[DEAUTH_DISASSOC_LEN];
        ifmgd->flags &= ~(IEEE80211_STA_CONNECTION_POLL |
                          IEEE80211_STA_BEACON_POLL);
-        ieee80211_set_disassoc(sdata, true, true);
+        ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, reason,
+                               false, frame_buf);
        mutex_unlock(&ifmgd->mtx);
        /*
         * must be outside lock due to cfg80211,
         * but that's not a problem.
         */
-        ieee80211_send_deauth_disassoc(sdata, bssid,
+        cfg80211_send_deauth(sdata->dev, frame_buf, DEAUTH_DISASSOC_LEN);
-                        IEEE80211_STYPE_DEAUTH, reason,
-                        NULL, true);
        mutex_lock(&local->mtx);
        ieee80211_recalc_idle(local);
@@ -2164,14 +2658,144 @@ static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata,
        mutex_lock(&ifmgd->mtx);
 }
+static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
+{
+        struct ieee80211_local *local = sdata->local;
+        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+        struct ieee80211_mgd_auth_data *auth_data = ifmgd->auth_data;
+        lockdep_assert_held(&ifmgd->mtx);
+        if (WARN_ON_ONCE(!auth_data))
+                return -EINVAL;
+        auth_data->tries++;
+        if (auth_data->tries > IEEE80211_AUTH_MAX_TRIES) {
+                printk(KERN_DEBUG "%s: authentication with %pM timed out\n",
+                       sdata->name, auth_data->bss->bssid);
+                /*
+                 * Most likely AP is not in the range so remove the
+                 * bss struct for that AP.
+                 */
+                cfg80211_unlink_bss(local->hw.wiphy, auth_data->bss);
+                return -ETIMEDOUT;
+        }
+        if (auth_data->bss->proberesp_ies) {
+                printk(KERN_DEBUG "%s: send auth to %pM (try %d/%d)\n",
+                       sdata->name, auth_data->bss->bssid, auth_data->tries,
+                       IEEE80211_AUTH_MAX_TRIES);
+                auth_data->expected_transaction = 2;
+                ieee80211_send_auth(sdata, 1, auth_data->algorithm,
+                                    auth_data->ie, auth_data->ie_len,
+                                    auth_data->bss->bssid,
+                                    auth_data->bss->bssid, NULL, 0, 0);
+        } else {
+                const u8 *ssidie;
+                printk(KERN_DEBUG "%s: direct probe to %pM (try %d/%i)\n",
+                       sdata->name, auth_data->bss->bssid, auth_data->tries,
+                       IEEE80211_AUTH_MAX_TRIES);
+                ssidie = ieee80211_bss_get_ie(auth_data->bss, WLAN_EID_SSID);
+                if (!ssidie)
+                        return -EINVAL;
+                /*
+                 * Direct probe is sent to broadcast address as some APs
+                 * will not answer to direct packet in unassociated state.
+                 */
+                ieee80211_send_probe_req(sdata, NULL, ssidie + 2, ssidie[1],
+                                         NULL, 0, (u32) -1, true, false);
+        }
+        auth_data->timeout = jiffies + IEEE80211_AUTH_TIMEOUT;
+        run_again(ifmgd, auth_data->timeout);
+        return 0;
+}
+static int ieee80211_do_assoc(struct ieee80211_sub_if_data *sdata)
+{
+        struct ieee80211_mgd_assoc_data *assoc_data = sdata->u.mgd.assoc_data;
+        struct ieee80211_local *local = sdata->local;
+        lockdep_assert_held(&sdata->u.mgd.mtx);
+        assoc_data->tries++;
+        if (assoc_data->tries > IEEE80211_ASSOC_MAX_TRIES) {
+                printk(KERN_DEBUG "%s: association with %pM timed out\n",
+                       sdata->name, assoc_data->bss->bssid);
+                /*
+                 * Most likely AP is not in the range so remove the
+                 * bss struct for that AP.
+                 */
+                cfg80211_unlink_bss(local->hw.wiphy, assoc_data->bss);
+                return -ETIMEDOUT;
+        }
+        printk(KERN_DEBUG "%s: associate with %pM (try %d/%d)\n",
+               sdata->name, assoc_data->bss->bssid, assoc_data->tries,
+               IEEE80211_ASSOC_MAX_TRIES);
+        ieee80211_send_assoc(sdata);
+        assoc_data->timeout = jiffies + IEEE80211_ASSOC_TIMEOUT;
+        run_again(&sdata->u.mgd, assoc_data->timeout);
+        return 0;
+}
 void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
 {
        struct ieee80211_local *local = sdata->local;
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
-        /* then process the rest of the work */
        mutex_lock(&ifmgd->mtx);
+        if (ifmgd->auth_data &&
+            time_after(jiffies, ifmgd->auth_data->timeout)) {
+                if (ifmgd->auth_data->done) {
+                        /*
+                         * ok ... we waited for assoc but userspace didn't,
+                         * so let's just kill the auth data
+                         */
+                        ieee80211_destroy_auth_data(sdata, false);
+                } else if (ieee80211_probe_auth(sdata)) {
+                        u8 bssid[ETH_ALEN];
+                        memcpy(bssid, ifmgd->auth_data->bss->bssid, ETH_ALEN);
+                        ieee80211_destroy_auth_data(sdata, false);
+                        mutex_unlock(&ifmgd->mtx);
+                        cfg80211_send_auth_timeout(sdata->dev, bssid);
+                        mutex_lock(&ifmgd->mtx);
+                }
+        } else if (ifmgd->auth_data)
+                run_again(ifmgd, ifmgd->auth_data->timeout);
+        if (ifmgd->assoc_data &&
+            time_after(jiffies, ifmgd->assoc_data->timeout)) {
+                if (!ifmgd->assoc_data->have_beacon ||
+                    ieee80211_do_assoc(sdata)) {
+                        u8 bssid[ETH_ALEN];
+                        memcpy(bssid, ifmgd->assoc_data->bss->bssid, ETH_ALEN);
+                        ieee80211_destroy_assoc_data(sdata, false);
+                        mutex_unlock(&ifmgd->mtx);
+                        cfg80211_send_assoc_timeout(sdata->dev, bssid);
+                        mutex_lock(&ifmgd->mtx);
+                }
+        } else if (ifmgd->assoc_data)
+                run_again(ifmgd, ifmgd->assoc_data->timeout);
        if (ifmgd->flags & (IEEE80211_STA_BEACON_POLL |
                            IEEE80211_STA_CONNECTION_POLL) &&
            ifmgd->associated) {
@@ -2247,6 +2871,10 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
        }
        mutex_unlock(&ifmgd->mtx);
+        mutex_lock(&local->mtx);
+        ieee80211_recalc_idle(local);
+        mutex_unlock(&local->mtx);
 }
 static void ieee80211_sta_bcn_mon_timer(unsigned long data)
@@ -2286,13 +2914,17 @@ static void ieee80211_sta_monitor_work(struct work_struct *work)
 static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata)
 {
+        u32 flags;
        if (sdata->vif.type == NL80211_IFTYPE_STATION) {
                sdata->u.mgd.flags &= ~(IEEE80211_STA_BEACON_POLL |
                                        IEEE80211_STA_CONNECTION_POLL);
                /* let's probe the connection once */
-                ieee80211_queue_work(&sdata->local->hw,
+                flags = sdata->local->hw.flags;
-                           &sdata->u.mgd.monitor_work);
+                if (!(flags & IEEE80211_HW_CONNECTION_MONITOR))
+                        ieee80211_queue_work(&sdata->local->hw,
+                                             &sdata->u.mgd.monitor_work);
                /* and do all the other regular work too */
                ieee80211_queue_work(&sdata->local->hw, &sdata->work);
        }
@@ -2356,7 +2988,6 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
                add_timer(&ifmgd->chswitch_timer);
        ieee80211_sta_reset_beacon_monitor(sdata);
        ieee80211_restart_sta_timer(sdata);
-        ieee80211_queue_work(&sdata->local->hw, &sdata->u.mgd.monitor_work);
 }
 #endif
@@ -2382,6 +3013,8 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
        ifmgd->flags = 0;
        ifmgd->powersave = sdata->wdev.ps;
+        ifmgd->uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;
+        ifmgd->uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
        mutex_init(&ifmgd->mtx);
@@ -2418,54 +3051,119 @@ int ieee80211_max_network_latency(struct notifier_block *nb,
        return 0;
 }
-/* config hooks */
+static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
-static enum work_done_result
+                                     struct cfg80211_bss *cbss, bool assoc)
-ieee80211_probe_auth_done(struct ieee80211_work *wk,
-                          struct sk_buff *skb)
 {
-        struct ieee80211_local *local = wk->sdata->local;
+        struct ieee80211_local *local = sdata->local;
+        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+        struct ieee80211_bss *bss = (void *)cbss->priv;
+        struct sta_info *sta;
+        bool have_sta = false;
+        int err;
-        if (!skb) {
+        if (WARN_ON(!ifmgd->auth_data && !ifmgd->assoc_data))
-                cfg80211_send_auth_timeout(wk->sdata->dev, wk->filter_ta);
+                return -EINVAL;
-                goto destroy;
+        if (assoc) {
+                rcu_read_lock();
+                have_sta = sta_info_get(sdata, cbss->bssid);
+                rcu_read_unlock();
        }
-        if (wk->type == IEEE80211_WORK_AUTH) {
+        if (!have_sta) {
-                cfg80211_send_rx_auth(wk->sdata->dev, skb->data, skb->len);
+                sta = sta_info_alloc(sdata, cbss->bssid, GFP_KERNEL);
-                goto destroy;
+                if (!sta)
+                        return -ENOMEM;
        }
-        mutex_lock(&wk->sdata->u.mgd.mtx);
+        mutex_lock(&local->mtx);
-        ieee80211_rx_mgmt_probe_resp(wk->sdata, skb);
+        ieee80211_recalc_idle(sdata->local);
-        mutex_unlock(&wk->sdata->u.mgd.mtx);
+        mutex_unlock(&local->mtx);
+        /* switch to the right channel */
+        local->oper_channel = cbss->channel;
+        ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
+        if (!have_sta) {
+                struct ieee80211_supported_band *sband;
+                u32 rates = 0, basic_rates = 0;
+                bool have_higher_than_11mbit;
+                int min_rate = INT_MAX, min_rate_index = -1;
+                sband = sdata->local->hw.wiphy->bands[cbss->channel->band];
+                ieee80211_get_rates(sband, bss->supp_rates,
+                                    bss->supp_rates_len,
+                                    &rates, &basic_rates,
+                                    &have_higher_than_11mbit,
+                                    &min_rate, &min_rate_index);
+                /*
+                 * This used to be a workaround for basic rates missing
+                 * in the association response frame. Now that we no
+                 * longer use the basic rates from there, it probably
+                 * doesn't happen any more, but keep the workaround so
+                 * in case some *other* APs are buggy in different ways
+                 * we can connect -- with a warning.
+                 */
+                if (!basic_rates && min_rate_index >= 0) {
+                        printk(KERN_DEBUG
+                               "%s: No basic rates, using min rate instead.\n",
+                               sdata->name);
+                        basic_rates = BIT(min_rate_index);
+                }
+                sta->sta.supp_rates[cbss->channel->band] = rates;
+                sdata->vif.bss_conf.basic_rates = basic_rates;
+                /* cf. IEEE 802.11 9.2.12 */
+                if (local->oper_channel->band == IEEE80211_BAND_2GHZ &&
+                    have_higher_than_11mbit)
+                        sdata->flags |= IEEE80211_SDATA_OPERATING_GMODE;
+                else
+                        sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE;
-        wk->type = IEEE80211_WORK_AUTH;
+                memcpy(ifmgd->bssid, cbss->bssid, ETH_ALEN);
-        wk->probe_auth.tries = 0;
-        return WORK_DONE_REQUEUE;
- destroy:
-        if (wk->probe_auth.synced)
-                drv_finish_tx_sync(local, wk->sdata, wk->filter_ta,
-                                   IEEE80211_TX_SYNC_AUTH);
-        return WORK_DONE_DESTROY;
+                /* tell driver about BSSID and basic rates */
+                ieee80211_bss_info_change_notify(sdata,
+                        BSS_CHANGED_BSSID | BSS_CHANGED_BASIC_RATES);
+                if (assoc)
+                        sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
+                err = sta_info_insert(sta);
+                sta = NULL;
+                if (err) {
+                        printk(KERN_DEBUG
+                               "%s: failed to insert STA entry for the AP (error %d)\n",
+                               sdata->name, err);
+                        return err;
+                }
+        } else
+                WARN_ON_ONCE(compare_ether_addr(ifmgd->bssid, cbss->bssid));
+        return 0;
 }
+/* config hooks */
 int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
                       struct cfg80211_auth_request *req)
 {
-        const u8 *ssid;
+        struct ieee80211_local *local = sdata->local;
-        struct ieee80211_work *wk;
+        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+        struct ieee80211_mgd_auth_data *auth_data;
        u16 auth_alg;
+        int err;
-        if (req->local_state_change)
+        /* prepare auth data structure */
-                return 0; /* no need to update mac80211 state */
        switch (req->auth_type) {
        case NL80211_AUTHTYPE_OPEN_SYSTEM:
                auth_alg = WLAN_AUTH_OPEN;
                break;
        case NL80211_AUTHTYPE_SHARED_KEY:
-                if (IS_ERR(sdata->local->wep_tx_tfm))
+                if (IS_ERR(local->wep_tx_tfm))
                        return -EOPNOTSUPP;
                auth_alg = WLAN_AUTH_SHARED_KEY;
                break;
@@ -2479,201 +3177,154 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
                return -EOPNOTSUPP;
        }
-        wk = kzalloc(sizeof(*wk) + req->ie_len, GFP_KERNEL);
+        auth_data = kzalloc(sizeof(*auth_data) + req->ie_len, GFP_KERNEL);
-        if (!wk)
+        if (!auth_data)
                return -ENOMEM;
-        memcpy(wk->filter_ta, req->bss->bssid, ETH_ALEN);
+        auth_data->bss = req->bss;
        if (req->ie && req->ie_len) {
-                memcpy(wk->ie, req->ie, req->ie_len);
+                memcpy(auth_data->ie, req->ie, req->ie_len);
-                wk->ie_len = req->ie_len;
+                auth_data->ie_len = req->ie_len;
        }
        if (req->key && req->key_len) {
-                wk->probe_auth.key_len = req->key_len;
+                auth_data->key_len = req->key_len;
-                wk->probe_auth.key_idx = req->key_idx;
+                auth_data->key_idx = req->key_idx;
-                memcpy(wk->probe_auth.key, req->key, req->key_len);
+                memcpy(auth_data->key, req->key, req->key_len);
        }
-        ssid = ieee80211_bss_get_ie(req->bss, WLAN_EID_SSID);
+        auth_data->algorithm = auth_alg;
-        memcpy(wk->probe_auth.ssid, ssid + 2, ssid[1]);
-        wk->probe_auth.ssid_len = ssid[1];
-        wk->probe_auth.algorithm = auth_alg;
+        /* try to authenticate/probe */
-        wk->probe_auth.privacy = req->bss->capability & WLAN_CAPABILITY_PRIVACY;
-        /* if we already have a probe, don't probe again */
+        mutex_lock(&ifmgd->mtx);
-        if (req->bss->proberesp_ies)
-                wk->type = IEEE80211_WORK_AUTH;
-        else
-                wk->type = IEEE80211_WORK_DIRECT_PROBE;
-        wk->chan = req->bss->channel;
-        wk->chan_type = NL80211_CHAN_NO_HT;
-        wk->sdata = sdata;
-        wk->done = ieee80211_probe_auth_done;
-        ieee80211_add_work(wk);
-        return 0;
-}
-/* create and insert a dummy station entry */
-static int ieee80211_pre_assoc(struct ieee80211_sub_if_data *sdata,
-                                u8 *bssid) {
-        struct sta_info *sta;
-        int err;
-        sta = sta_info_alloc(sdata, bssid, GFP_KERNEL);
-        if (!sta)
-                return -ENOMEM;
-        sta->dummy = true;
-        err = sta_info_insert(sta);
-        sta = NULL;
-        if (err) {
-                printk(KERN_DEBUG "%s: failed to insert Dummy STA entry for"
-                       " the AP (error %d)\n", sdata->name, err);
-                return err;
-        }
-        return 0;
-}
-static enum work_done_result ieee80211_assoc_done(struct ieee80211_work *wk,
-                                                  struct sk_buff *skb)
-{
-        struct ieee80211_local *local = wk->sdata->local;
-        struct ieee80211_mgmt *mgmt;
-        struct ieee80211_rx_status *rx_status;
-        struct ieee802_11_elems elems;
-        struct cfg80211_bss *cbss = wk->assoc.bss;
-        u16 status;
-        if (!skb) {
+        if ((ifmgd->auth_data && !ifmgd->auth_data->done) ||
-                sta_info_destroy_addr(wk->sdata, cbss->bssid);
+            ifmgd->assoc_data) {
-                cfg80211_send_assoc_timeout(wk->sdata->dev, wk->filter_ta);
+                err = -EBUSY;
-                goto destroy;
+                goto err_free;
        }
-        if (wk->type == IEEE80211_WORK_ASSOC_BEACON_WAIT) {
+        if (ifmgd->auth_data)
-                mutex_lock(&wk->sdata->u.mgd.mtx);
+                ieee80211_destroy_auth_data(sdata, false);
-                rx_status = (void *) skb->cb;
-                ieee802_11_parse_elems(skb->data + 24 + 12, skb->len - 24 - 12, &elems);
-                ieee80211_rx_bss_info(wk->sdata, (void *)skb->data, skb->len, rx_status,
-                                      &elems, true);
-                mutex_unlock(&wk->sdata->u.mgd.mtx);
-                wk->type = IEEE80211_WORK_ASSOC;
+        /* prep auth_data so we don't go into idle on disassoc */
-                /* not really done yet */
+        ifmgd->auth_data = auth_data;
-                return WORK_DONE_REQUEUE;
-        }
-        mgmt = (void *)skb->data;
+        if (ifmgd->associated)
-        status = le16_to_cpu(mgmt->u.assoc_resp.status_code);
+                ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
-        if (status == WLAN_STATUS_SUCCESS) {
+        printk(KERN_DEBUG "%s: authenticate with %pM\n",
-                if (wk->assoc.synced)
+               sdata->name, req->bss->bssid);
-                        drv_finish_tx_sync(local, wk->sdata, wk->filter_ta,
-                                           IEEE80211_TX_SYNC_ASSOC);
-                mutex_lock(&wk->sdata->u.mgd.mtx);
+        err = ieee80211_prep_connection(sdata, req->bss, false);
-                if (!ieee80211_assoc_success(wk, mgmt, skb->len)) {
+        if (err)
-                        mutex_unlock(&wk->sdata->u.mgd.mtx);
+                goto err_clear;
-                        /* oops -- internal error -- send timeout for now */
-                        sta_info_destroy_addr(wk->sdata, cbss->bssid);
-                        cfg80211_send_assoc_timeout(wk->sdata->dev,
-                                                    wk->filter_ta);
-                        return WORK_DONE_DESTROY;
-                }
-                mutex_unlock(&wk->sdata->u.mgd.mtx);
+        err = ieee80211_probe_auth(sdata);
-        } else {
+        if (err) {
-                /* assoc failed - destroy the dummy station entry */
+                sta_info_destroy_addr(sdata, req->bss->bssid);
-                sta_info_destroy_addr(wk->sdata, cbss->bssid);
+                goto err_clear;
        }
-        cfg80211_send_rx_assoc(wk->sdata->dev, skb->data, skb->len);
+        /* hold our own reference */
- destroy:
+        cfg80211_ref_bss(auth_data->bss);
-        if (wk->assoc.synced)
+        err = 0;
-                drv_finish_tx_sync(local, wk->sdata, wk->filter_ta,
+        goto out_unlock;
-                                   IEEE80211_TX_SYNC_ASSOC);
+ err_clear:
+        ifmgd->auth_data = NULL;
+ err_free:
+        kfree(auth_data);
+ out_unlock:
+        mutex_unlock(&ifmgd->mtx);
-        return WORK_DONE_DESTROY;
+        return err;
 }
 int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
                        struct cfg80211_assoc_request *req)
 {
+        struct ieee80211_local *local = sdata->local;
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
        struct ieee80211_bss *bss = (void *)req->bss->priv;
-        struct ieee80211_work *wk;
+        struct ieee80211_mgd_assoc_data *assoc_data;
-        const u8 *ssid;
+        struct ieee80211_supported_band *sband;
+        const u8 *ssidie;
        int i, err;
+        ssidie = ieee80211_bss_get_ie(req->bss, WLAN_EID_SSID);
+        if (!ssidie)
+                return -EINVAL;
+        assoc_data = kzalloc(sizeof(*assoc_data) + req->ie_len, GFP_KERNEL);
+        if (!assoc_data)
+                return -ENOMEM;
        mutex_lock(&ifmgd->mtx);
-        if (ifmgd->associated) {
-                if (!req->prev_bssid ||
-                    memcmp(req->prev_bssid, ifmgd->associated->bssid,
-                           ETH_ALEN)) {
-                        /*
-                         * We are already associated and the request was not a
-                         * reassociation request from the current BSS, so
-                         * reject it.
-                         */
-                        mutex_unlock(&ifmgd->mtx);
-                        return -EALREADY;
-                }
-                /* Trying to reassociate - clear previous association state */
+        if (ifmgd->associated)
-                ieee80211_set_disassoc(sdata, true, false);
+                ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
+        if (ifmgd->auth_data && !ifmgd->auth_data->done) {
+                err = -EBUSY;
+                goto err_free;
        }
-        mutex_unlock(&ifmgd->mtx);
-        wk = kzalloc(sizeof(*wk) + req->ie_len, GFP_KERNEL);
+        if (ifmgd->assoc_data) {
-        if (!wk)
+                err = -EBUSY;
-                return -ENOMEM;
+                goto err_free;
+        }
-        /*
+        if (ifmgd->auth_data) {
-         * create a dummy station info entry in order
+                bool match;
-         * to start accepting incoming EAPOL packets from the station
-         */
+                /* keep sta info, bssid if matching */
-        err = ieee80211_pre_assoc(sdata, req->bss->bssid);
+                match = compare_ether_addr(ifmgd->bssid, req->bss->bssid) == 0;
-        if (err) {
+                ieee80211_destroy_auth_data(sdata, match);
-                kfree(wk);
-                return err;
        }
+        /* prepare assoc data */
        ifmgd->flags &= ~IEEE80211_STA_DISABLE_11N;
        ifmgd->flags &= ~IEEE80211_STA_NULLFUNC_ACKED;
        ifmgd->beacon_crc_valid = false;
+        /*
+         * IEEE802.11n does not allow TKIP/WEP as pairwise ciphers in HT mode.
+         * We still associate in non-HT mode (11a/b/g) if any one of these
+         * ciphers is configured as pairwise.
+         * We can set this to true for non-11n hardware, that'll be checked
+         * separately along with the peer capabilities.
+         */
        for (i = 0; i < req->crypto.n_ciphers_pairwise; i++)
                if (req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP40 ||
                    req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_TKIP ||
                    req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP104)
                        ifmgd->flags |= IEEE80211_STA_DISABLE_11N;
        if (req->flags & ASSOC_REQ_DISABLE_HT)
                ifmgd->flags |= IEEE80211_STA_DISABLE_11N;
+        /* Also disable HT if we don't support it or the AP doesn't use WMM */
+        sband = local->hw.wiphy->bands[req->bss->channel->band];
+        if (!sband->ht_cap.ht_supported ||
+            local->hw.queues < 4 || !bss->wmm_used)
+                ifmgd->flags |= IEEE80211_STA_DISABLE_11N;
        memcpy(&ifmgd->ht_capa, &req->ht_capa, sizeof(ifmgd->ht_capa));
        memcpy(&ifmgd->ht_capa_mask, &req->ht_capa_mask,
               sizeof(ifmgd->ht_capa_mask));
        if (req->ie && req->ie_len) {
-                memcpy(wk->ie, req->ie, req->ie_len);
+                memcpy(assoc_data->ie, req->ie, req->ie_len);
-                wk->ie_len = req->ie_len;
+                assoc_data->ie_len = req->ie_len;
-        } else
+        }
-                wk->ie_len = 0;
-        wk->assoc.bss = req->bss;
-        memcpy(wk->filter_ta, req->bss->bssid, ETH_ALEN);
+        assoc_data->bss = req->bss;
-        /* new association always uses requested smps mode */
        if (ifmgd->req_smps == IEEE80211_SMPS_AUTOMATIC) {
                if (ifmgd->powersave)
                        ifmgd->ap_smps = IEEE80211_SMPS_DYNAMIC;
@@ -2682,47 +3333,27 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
        } else
                ifmgd->ap_smps = ifmgd->req_smps;
-        wk->assoc.smps = ifmgd->ap_smps;
+        assoc_data->capability = req->bss->capability;
-        /*
+        assoc_data->wmm = bss->wmm_used && (local->hw.queues >= 4);
-         * IEEE802.11n does not allow TKIP/WEP as pairwise ciphers in HT mode.
+        assoc_data->supp_rates = bss->supp_rates;
-         * We still associate in non-HT mode (11a/b/g) if any one of these
+        assoc_data->supp_rates_len = bss->supp_rates_len;
-         * ciphers is configured as pairwise.
+        assoc_data->ht_information_ie =
-         * We can set this to true for non-11n hardware, that'll be checked
-         * separately along with the peer capabilities.
-         */
-        wk->assoc.use_11n = !(ifmgd->flags & IEEE80211_STA_DISABLE_11N);
-        wk->assoc.capability = req->bss->capability;
-        wk->assoc.wmm_used = bss->wmm_used;
-        wk->assoc.supp_rates = bss->supp_rates;
-        wk->assoc.supp_rates_len = bss->supp_rates_len;
-        wk->assoc.ht_information_ie =
                ieee80211_bss_get_ie(req->bss, WLAN_EID_HT_INFORMATION);
        if (bss->wmm_used && bss->uapsd_supported &&
            (sdata->local->hw.flags & IEEE80211_HW_SUPPORTS_UAPSD)) {
-                wk->assoc.uapsd_used = true;
+                assoc_data->uapsd = true;
                ifmgd->flags |= IEEE80211_STA_UAPSD_ENABLED;
        } else {
-                wk->assoc.uapsd_used = false;
+                assoc_data->uapsd = false;
                ifmgd->flags &= ~IEEE80211_STA_UAPSD_ENABLED;
        }
-        ssid = ieee80211_bss_get_ie(req->bss, WLAN_EID_SSID);
+        memcpy(assoc_data->ssid, ssidie + 2, ssidie[1]);
-        memcpy(wk->assoc.ssid, ssid + 2, ssid[1]);
+        assoc_data->ssid_len = ssidie[1];
-        wk->assoc.ssid_len = ssid[1];
        if (req->prev_bssid)
-                memcpy(wk->assoc.prev_bssid, req->prev_bssid, ETH_ALEN);
+                memcpy(assoc_data->prev_bssid, req->prev_bssid, ETH_ALEN);
-        wk->chan = req->bss->channel;
-        wk->chan_type = NL80211_CHAN_NO_HT;
-        wk->sdata = sdata;
-        wk->done = ieee80211_assoc_done;
-        if (!bss->dtim_period &&
-            sdata->local->hw.flags & IEEE80211_HW_NEED_DTIM_PERIOD)
-                wk->type = IEEE80211_WORK_ASSOC_BEACON_WAIT;
-        else
-                wk->type = IEEE80211_WORK_ASSOC;
        if (req->use_mfp) {
                ifmgd->mfp = IEEE80211_MFP_REQUIRED;
@@ -2740,91 +3371,87 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
        sdata->control_port_protocol = req->crypto.control_port_ethertype;
        sdata->control_port_no_encrypt = req->crypto.control_port_no_encrypt;
-        ieee80211_add_work(wk);
+        /* kick off associate process */
-        return 0;
+        ifmgd->assoc_data = assoc_data;
+        err = ieee80211_prep_connection(sdata, req->bss, true);
+        if (err)
+                goto err_clear;
+        if (!bss->dtim_period &&
+            sdata->local->hw.flags & IEEE80211_HW_NEED_DTIM_PERIOD) {
+                /*
+                 * Wait up to one beacon interval ...
+                 * should this be more if we miss one?
+                 */
+                printk(KERN_DEBUG "%s: waiting for beacon from %pM\n",
+                       sdata->name, ifmgd->bssid);
+                assoc_data->timeout = jiffies +
+                                TU_TO_EXP_TIME(req->bss->beacon_interval);
+        } else {
+                assoc_data->have_beacon = true;
+                assoc_data->sent_assoc = false;
+                assoc_data->timeout = jiffies;
+        }
+        run_again(ifmgd, assoc_data->timeout);
+        if (bss->corrupt_data) {
+                char *corrupt_type = "data";
+                if (bss->corrupt_data & IEEE80211_BSS_CORRUPT_BEACON) {
+                        if (bss->corrupt_data &
+                                        IEEE80211_BSS_CORRUPT_PROBE_RESP)
+                                corrupt_type = "beacon and probe response";
+                        else
+                                corrupt_type = "beacon";
+                } else if (bss->corrupt_data & IEEE80211_BSS_CORRUPT_PROBE_RESP)
+                        corrupt_type = "probe response";
+                printk(KERN_DEBUG "%s: associating with AP with corrupt %s\n",
+                       sdata->name, corrupt_type);
+        }
+        err = 0;
+        goto out;
+ err_clear:
+        ifmgd->assoc_data = NULL;
+ err_free:
+        kfree(assoc_data);
+ out:
+        mutex_unlock(&ifmgd->mtx);
+        return err;
 }
 int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
-                         struct cfg80211_deauth_request *req,
+                         struct cfg80211_deauth_request *req)
-                         void *cookie)
 {
-        struct ieee80211_local *local = sdata->local;
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
-        u8 bssid[ETH_ALEN];
+        u8 frame_buf[DEAUTH_DISASSOC_LEN];
-        bool assoc_bss = false;
        mutex_lock(&ifmgd->mtx);
-        memcpy(bssid, req->bss->bssid, ETH_ALEN);
+        if (ifmgd->auth_data) {
-        if (ifmgd->associated == req->bss) {
+                ieee80211_destroy_auth_data(sdata, false);
-                ieee80211_set_disassoc(sdata, false, true);
-                mutex_unlock(&ifmgd->mtx);
-                assoc_bss = true;
-        } else {
-                bool not_auth_yet = false;
-                struct ieee80211_work *tmp, *wk = NULL;
                mutex_unlock(&ifmgd->mtx);
+                return 0;
-                mutex_lock(&local->mtx);
-                list_for_each_entry(tmp, &local->work_list, list) {
-                        if (tmp->sdata != sdata)
-                                continue;
-                        if (tmp->type != IEEE80211_WORK_DIRECT_PROBE &&
-                            tmp->type != IEEE80211_WORK_AUTH &&
-                            tmp->type != IEEE80211_WORK_ASSOC &&
-                            tmp->type != IEEE80211_WORK_ASSOC_BEACON_WAIT)
-                                continue;
-                        if (memcmp(req->bss->bssid, tmp->filter_ta, ETH_ALEN))
-                                continue;
-                        not_auth_yet = tmp->type == IEEE80211_WORK_DIRECT_PROBE;
-                        list_del_rcu(&tmp->list);
-                        synchronize_rcu();
-                        wk = tmp;
-                        break;
-                }
-                mutex_unlock(&local->mtx);
-                if (wk && wk->type == IEEE80211_WORK_ASSOC) {
-                        /* clean up dummy sta & TX sync */
-                        sta_info_destroy_addr(wk->sdata, wk->filter_ta);
-                        if (wk->assoc.synced)
-                                drv_finish_tx_sync(local, wk->sdata,
-                                                   wk->filter_ta,
-                                                   IEEE80211_TX_SYNC_ASSOC);
-                } else if (wk && wk->type == IEEE80211_WORK_AUTH) {
-                        if (wk->probe_auth.synced)
-                                drv_finish_tx_sync(local, wk->sdata,
-                                                   wk->filter_ta,
-                                                   IEEE80211_TX_SYNC_AUTH);
-                }
-                kfree(wk);
-                /*
-                 * If somebody requests authentication and we haven't
-                 * sent out an auth frame yet there's no need to send
-                 * out a deauth frame either. If the state was PROBE,
-                 * then this is the case. If it's AUTH we have sent a
-                 * frame, and if it's IDLE we have completed the auth
-                 * process already.
-                 */
-                if (not_auth_yet) {
-                        __cfg80211_auth_canceled(sdata->dev, bssid);
-                        return 0;
-                }
        }
-        printk(KERN_DEBUG "%s: deauthenticating from %pM by local choice (reason=%d)\n",
+        printk(KERN_DEBUG
-               sdata->name, bssid, req->reason_code);
+               "%s: deauthenticating from %pM by local choice (reason=%d)\n",
+               sdata->name, req->bssid, req->reason_code);
+        if (ifmgd->associated &&
+            compare_ether_addr(ifmgd->associated->bssid, req->bssid) == 0)
+                ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
+                                       req->reason_code, true, frame_buf);
+        else
+                ieee80211_send_deauth_disassoc(sdata, req->bssid,
+                                               IEEE80211_STYPE_DEAUTH,
+                                               req->reason_code, true,
+                                               frame_buf);
+        mutex_unlock(&ifmgd->mtx);
-        ieee80211_send_deauth_disassoc(sdata, bssid, IEEE80211_STYPE_DEAUTH,
+        __cfg80211_send_deauth(sdata->dev, frame_buf, DEAUTH_DISASSOC_LEN);
-                                       req->reason_code, cookie,
-                                       !req->local_state_change);
-        if (assoc_bss)
-                sta_info_flush(sdata->local, sdata);
        mutex_lock(&sdata->local->mtx);
        ieee80211_recalc_idle(sdata->local);
@@ -2834,11 +3461,11 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
 }
 int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
-                           struct cfg80211_disassoc_request *req,
+                           struct cfg80211_disassoc_request *req)
-                           void *cookie)
 {
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
        u8 bssid[ETH_ALEN];
+        u8 frame_buf[DEAUTH_DISASSOC_LEN];
        mutex_lock(&ifmgd->mtx);
@@ -2857,14 +3484,12 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
               sdata->name, req->bss->bssid, req->reason_code);
        memcpy(bssid, req->bss->bssid, ETH_ALEN);
-        ieee80211_set_disassoc(sdata, false, true);
+        ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DISASSOC,
+                               req->reason_code, !req->local_state_change,
+                               frame_buf);
        mutex_unlock(&ifmgd->mtx);
-        ieee80211_send_deauth_disassoc(sdata, req->bss->bssid,
+        __cfg80211_send_disassoc(sdata->dev, frame_buf, DEAUTH_DISASSOC_LEN);
-                        IEEE80211_STYPE_DISASSOC, req->reason_code,
-                        cookie, !req->local_state_change);
-        sta_info_flush(sdata->local, sdata);
        mutex_lock(&sdata->local->mtx);
        ieee80211_recalc_idle(sdata->local);
@@ -2873,6 +3498,19 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
        return 0;
 }
+void ieee80211_mgd_teardown(struct ieee80211_sub_if_data *sdata)
+{
+        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+        mutex_lock(&ifmgd->mtx);
+        if (ifmgd->assoc_data)
+                ieee80211_destroy_assoc_data(sdata, false);
+        if (ifmgd->auth_data)
+                ieee80211_destroy_auth_data(sdata, false);
+        del_timer_sync(&ifmgd->timer);
+        mutex_unlock(&ifmgd->mtx);
+}
 void ieee80211_cqm_rssi_notify(struct ieee80211_vif *vif,
                               enum nl80211_cqm_rssi_threshold_event rssi_event,
                               gfp_t gfp)
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index 596efaf50e09..ef8eba1d736d 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -98,13 +98,12 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
        mutex_lock(&local->sta_mtx);
        list_for_each_entry(sta, &local->sta_list, list) {
                if (sta->uploaded) {
-                        sdata = sta->sdata;
+                        enum ieee80211_sta_state state;
-                        if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
-                                sdata = container_of(sdata->bss,
-                                             struct ieee80211_sub_if_data,
-                                             u.ap);
-                        drv_sta_remove(local, sdata, &sta->sta);
+                        state = sta->sta_state;
+                        for (; state > IEEE80211_STA_NOTEXIST; state--)
+                                WARN_ON(drv_sta_state(local, sta->sdata, sta,
+                                                      state, state - 1));
                }
                mesh_plink_quiesce(sta);
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index f9b8e819ca63..b4f7600a3e36 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -159,7 +159,6 @@ static struct rate_control_ref *rate_control_alloc(const char *name,
        ref = kmalloc(sizeof(struct rate_control_ref), GFP_KERNEL);
        if (!ref)
                goto fail_ref;
-        kref_init(&ref->kref);
        ref->local = local;
        ref->ops = ieee80211_rate_control_ops_get(name);
        if (!ref->ops)
@@ -184,11 +183,8 @@ fail_ref:
        return NULL;
 }
-static void rate_control_release(struct kref *kref)
+static void rate_control_free(struct rate_control_ref *ctrl_ref)
 {
-        struct rate_control_ref *ctrl_ref;
-        ctrl_ref = container_of(kref, struct rate_control_ref, kref);
        ctrl_ref->ops->free(ctrl_ref->priv);
 #ifdef CONFIG_MAC80211_DEBUGFS
@@ -293,8 +289,8 @@ bool rate_control_send_low(struct ieee80211_sta *sta,
 }
 EXPORT_SYMBOL(rate_control_send_low);
-static void rate_idx_match_mask(struct ieee80211_tx_rate *rate,
+static bool rate_idx_match_legacy_mask(struct ieee80211_tx_rate *rate,
-                                int n_bitrates, u32 mask)
+                                       int n_bitrates, u32 mask)
 {
        int j;
@@ -303,7 +299,7 @@ static void rate_idx_match_mask(struct ieee80211_tx_rate *rate,
                if (mask & (1 << j)) {
                        /* Okay, found a suitable rate. Use it. */
                        rate->idx = j;
-                        return;
+                        return true;
                }
        }
@@ -312,6 +308,112 @@ static void rate_idx_match_mask(struct ieee80211_tx_rate *rate,
                if (mask & (1 << j)) {
                        /* Okay, found a suitable rate. Use it. */
                        rate->idx = j;
+                        return true;
+                }
+        }
+        return false;
+}
+static bool rate_idx_match_mcs_mask(struct ieee80211_tx_rate *rate,
+                                    u8 mcs_mask[IEEE80211_HT_MCS_MASK_LEN])
+{
+        int i, j;
+        int ridx, rbit;
+        ridx = rate->idx / 8;
+        rbit = rate->idx % 8;
+        /* sanity check */
+        if (ridx < 0 || ridx >= IEEE80211_HT_MCS_MASK_LEN)
+                return false;
+        /* See whether the selected rate or anything below it is allowed. */
+        for (i = ridx; i >= 0; i--) {
+                for (j = rbit; j >= 0; j--)
+                        if (mcs_mask[i] & BIT(j)) {
+                                rate->idx = i * 8 + j;
+                                return true;
+                        }
+                rbit = 7;
+        }
+        /* Try to find a higher rate that would be allowed */
+        ridx = (rate->idx + 1) / 8;
+        rbit = (rate->idx + 1) % 8;
+        for (i = ridx; i < IEEE80211_HT_MCS_MASK_LEN; i++) {
+                for (j = rbit; j < 8; j++)
+                        if (mcs_mask[i] & BIT(j)) {
+                                rate->idx = i * 8 + j;
+                                return true;
+                        }
+                rbit = 0;
+        }
+        return false;
+}
+static void rate_idx_match_mask(struct ieee80211_tx_rate *rate,
+                                struct ieee80211_tx_rate_control *txrc,
+                                u32 mask,
+                                u8 mcs_mask[IEEE80211_HT_MCS_MASK_LEN])
+{
+        struct ieee80211_tx_rate alt_rate;
+        /* handle HT rates */
+        if (rate->flags & IEEE80211_TX_RC_MCS) {
+                if (rate_idx_match_mcs_mask(rate, mcs_mask))
+                        return;
+                /* also try the legacy rates. */
+                alt_rate.idx = 0;
+                /* keep protection flags */
+                alt_rate.flags = rate->flags &
+                                 (IEEE80211_TX_RC_USE_RTS_CTS |
+                                  IEEE80211_TX_RC_USE_CTS_PROTECT |
+                                  IEEE80211_TX_RC_USE_SHORT_PREAMBLE);
+                alt_rate.count = rate->count;
+                if (rate_idx_match_legacy_mask(&alt_rate,
+                                               txrc->sband->n_bitrates,
+                                               mask)) {
+                        *rate = alt_rate;
+                        return;
+                }
+        } else {
+                struct sk_buff *skb = txrc->skb;
+                struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+                __le16 fc;
+                /* handle legacy rates */
+                if (rate_idx_match_legacy_mask(rate, txrc->sband->n_bitrates,
+                                               mask))
+                        return;
+                /* if HT BSS, and we handle a data frame, also try HT rates */
+                if (txrc->bss_conf->channel_type == NL80211_CHAN_NO_HT)
+                        return;
+                fc = hdr->frame_control;
+                if (!ieee80211_is_data(fc))
+                        return;
+                alt_rate.idx = 0;
+                /* keep protection flags */
+                alt_rate.flags = rate->flags &
+                                 (IEEE80211_TX_RC_USE_RTS_CTS |
+                                  IEEE80211_TX_RC_USE_CTS_PROTECT |
+                                  IEEE80211_TX_RC_USE_SHORT_PREAMBLE);
+                alt_rate.count = rate->count;
+                alt_rate.flags |= IEEE80211_TX_RC_MCS;
+                if ((txrc->bss_conf->channel_type == NL80211_CHAN_HT40MINUS) ||
+                    (txrc->bss_conf->channel_type == NL80211_CHAN_HT40PLUS))
+                        alt_rate.flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
+                if (rate_idx_match_mcs_mask(&alt_rate, mcs_mask)) {
+                        *rate = alt_rate;
                        return;
                }
        }
@@ -335,6 +437,7 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(txrc->skb);
        int i;
        u32 mask;
+        u8 mcs_mask[IEEE80211_HT_MCS_MASK_LEN];
        if (sta && test_sta_flag(sta, WLAN_STA_RATE_CONTROL)) {
                ista = &sta->sta;
@@ -358,10 +461,14 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
         * the common case.
         */
        mask = sdata->rc_rateidx_mask[info->band];
+        memcpy(mcs_mask, sdata->rc_rateidx_mcs_mask[info->band],
+               sizeof(mcs_mask));
        if (mask != (1 << txrc->sband->n_bitrates) - 1) {
                if (sta) {
                        /* Filter out rates that the STA does not support */
                        mask &= sta->sta.supp_rates[info->band];
+                        for (i = 0; i < sizeof(mcs_mask); i++)
+                                mcs_mask[i] &= sta->sta.ht_cap.mcs.rx_mask[i];
                }
                /*
                 * Make sure the rate index selected for each TX rate is
@@ -372,32 +479,18 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
                        /* Skip invalid rates */
                        if (info->control.rates[i].idx < 0)
                                break;
-                        /* Rate masking supports only legacy rates for now */
+                        rate_idx_match_mask(&info->control.rates[i], txrc,
-                        if (info->control.rates[i].flags & IEEE80211_TX_RC_MCS)
+                                            mask, mcs_mask);
-                                continue;
-                        rate_idx_match_mask(&info->control.rates[i],
-                                            txrc->sband->n_bitrates, mask);
                }
        }
        BUG_ON(info->control.rates[0].idx < 0);
 }
-struct rate_control_ref *rate_control_get(struct rate_control_ref *ref)
-{
-        kref_get(&ref->kref);
-        return ref;
-}
-void rate_control_put(struct rate_control_ref *ref)
-{
-        kref_put(&ref->kref, rate_control_release);
-}
 int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
                                 const char *name)
 {
-        struct rate_control_ref *ref, *old;
+        struct rate_control_ref *ref;
        ASSERT_RTNL();
@@ -417,12 +510,8 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
                return -ENOENT;
        }
-        old = local->rate_ctrl;
+        WARN_ON(local->rate_ctrl);
        local->rate_ctrl = ref;
-        if (old) {
-                rate_control_put(old);
-                sta_info_flush(local, NULL);
-        }
        wiphy_debug(local->hw.wiphy, "Selected rate control algorithm '%s'\n",
                    ref->ops->name);
@@ -440,6 +529,6 @@ void rate_control_deinitialize(struct ieee80211_local *local)
                return;
        local->rate_ctrl = NULL;
-        rate_control_put(ref);
+        rate_control_free(ref);
 }
diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h
index 80cfc006dd74..fbb1efdc4d04 100644
--- a/net/mac80211/rate.h
+++ b/net/mac80211/rate.h
@@ -14,7 +14,6 @@
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <linux/types.h>
-#include <linux/kref.h>
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
 #include "sta_info.h"
@@ -23,14 +22,11 @@ struct rate_control_ref {
        struct ieee80211_local *local;
        struct rate_control_ops *ops;
        void *priv;
-        struct kref kref;
 };
 void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
                           struct sta_info *sta,
                           struct ieee80211_tx_rate_control *txrc);
-struct rate_control_ref *rate_control_get(struct rate_control_ref *ref);
-void rate_control_put(struct rate_control_ref *ref);
 static inline void rate_control_tx_status(struct ieee80211_local *local,
                                          struct ieee80211_supported_band *sband,
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index ff5f7b84e825..16e0b277b9a8 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -568,6 +568,13 @@ minstrel_get_sample_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
        minstrel_next_sample_idx(mi);
        /*
+         * Sampling might add some overhead (RTS, no aggregation)
+         * to the frame. Hence, don't use sampling for the currently
+         * used max TP rate.
+         */
+        if (sample_idx == mi->max_tp_rate)
+                return -1;
+        /*
         * When not using MRR, do not sample if the probability is already
         * higher than 95% to avoid wasting airtime
         */
@@ -692,6 +699,7 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband,
        int ack_dur;
        int stbc;
        int i;
+        unsigned int smps;
        /* fall back to the old minstrel for legacy stations */
        if (!sta->ht_cap.ht_supported)
@@ -731,6 +739,9 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband,
            oper_chan_type != NL80211_CHAN_HT40PLUS)
                sta_cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+        smps = (sta_cap & IEEE80211_HT_CAP_SM_PS) >>
+                IEEE80211_HT_CAP_SM_PS_SHIFT;
        for (i = 0; i < ARRAY_SIZE(mi->groups); i++) {
                u16 req = 0;
@@ -748,6 +759,11 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband,
                if ((sta_cap & req) != req)
                        continue;
+                /* Mark MCS > 7 as unsupported if STA is in static SMPS mode */
+                if (smps == WLAN_HT_CAP_SM_PS_STATIC &&
+                    minstrel_mcs_groups[i].streams > 1)
+                        continue;
                mi->groups[i].supported =
                        mcs->rx_mask[minstrel_mcs_groups[i].streams - 1];
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 5a5e504a8ffb..bcfe8c77c839 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -19,6 +19,7 @@
 #include <linux/export.h>
 #include <net/mac80211.h>
 #include <net/ieee80211_radiotap.h>
+#include <asm/unaligned.h>
 #include "ieee80211_i.h"
 #include "driver-ops.h"
@@ -176,7 +177,8 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
        pos += 2;
        /* IEEE80211_RADIOTAP_DBM_ANTSIGNAL */
-        if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM) {
+        if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM &&
+            !(status->flag & RX_FLAG_NO_SIGNAL_VAL)) {
                *pos = status->signal;
                rthdr->it_present |=
                        cpu_to_le32(1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL);
@@ -226,7 +228,7 @@ ieee80211_rx_monitor(struct ieee80211_local *local, struct sk_buff *origskb,
 {
        struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(origskb);
        struct ieee80211_sub_if_data *sdata;
-        int needed_headroom = 0;
+        int needed_headroom;
        struct sk_buff *skb, *skb2;
        struct net_device *prev_dev = NULL;
        int present_fcs_len = 0;
@@ -488,12 +490,12 @@ ieee80211_rx_mesh_check(struct ieee80211_rx_data *rx)
                        if (ieee80211_has_tods(hdr->frame_control) ||
                                !ieee80211_has_fromds(hdr->frame_control))
                                return RX_DROP_MONITOR;
-                        if (memcmp(hdr->addr3, dev_addr, ETH_ALEN) == 0)
+                        if (compare_ether_addr(hdr->addr3, dev_addr) == 0)
                                return RX_DROP_MONITOR;
                } else {
                        if (!ieee80211_has_a4(hdr->frame_control))
                                return RX_DROP_MONITOR;
-                        if (memcmp(hdr->addr4, dev_addr, ETH_ALEN) == 0)
+                        if (compare_ether_addr(hdr->addr4, dev_addr) == 0)
                                return RX_DROP_MONITOR;
                }
        }
@@ -859,7 +861,12 @@ ieee80211_rx_h_check(struct ieee80211_rx_data *rx)
                     rx->sdata->vif.type != NL80211_IFTYPE_ADHOC &&
                     rx->sdata->vif.type != NL80211_IFTYPE_WDS &&
                     (!rx->sta || !test_sta_flag(rx->sta, WLAN_STA_ASSOC)))) {
-                if (rx->sta && rx->sta->dummy &&
+                /*
+                 * accept port control frames from the AP even when it's not
+                 * yet marked ASSOC to prevent a race where we don't set the
+                 * assoc bit quickly enough before it sends the first frame
+                 */
+                if (rx->sta && rx->sdata->vif.type == NL80211_IFTYPE_STATION &&
                    ieee80211_is_data_present(hdr->frame_control)) {
                        u16 ethertype;
                        u8 *payload;
@@ -1056,20 +1063,9 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx)
                return RX_DROP_MONITOR;
        }
-        if (skb_linearize(rx->skb))
-                return RX_DROP_UNUSABLE;
-        /* the hdr variable is invalid now! */
        switch (rx->key->conf.cipher) {
        case WLAN_CIPHER_SUITE_WEP40:
        case WLAN_CIPHER_SUITE_WEP104:
-                /* Check for weak IVs if possible */
-                if (rx->sta && ieee80211_is_data(fc) &&
-                    (!(status->flag & RX_FLAG_IV_STRIPPED) ||
-                     !(status->flag & RX_FLAG_DECRYPTED)) &&
-                    ieee80211_wep_is_weak_iv(rx->skb, rx->key))
-                        rx->sta->wep_weak_iv_count++;
                result = ieee80211_crypto_wep_decrypt(rx);
                break;
        case WLAN_CIPHER_SUITE_TKIP:
@@ -1089,6 +1085,8 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx)
                return RX_DROP_UNUSABLE;
        }
+        /* the hdr variable is invalid after the decrypt handlers */
        /* either the frame has been decrypted or will be dropped */
        status->flag |= RX_FLAG_DECRYPTED;
@@ -1145,19 +1143,15 @@ static void ap_sta_ps_start(struct sta_info *sta)
 static void ap_sta_ps_end(struct sta_info *sta)
 {
-        struct ieee80211_sub_if_data *sdata = sta->sdata;
-        atomic_dec(&sdata->bss->num_sta_ps);
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
        printk(KERN_DEBUG "%s: STA %pM aid %d exits power save mode\n",
-               sdata->name, sta->sta.addr, sta->sta.aid);
+               sta->sdata->name, sta->sta.addr, sta->sta.aid);
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
        if (test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
                printk(KERN_DEBUG "%s: STA %pM aid %d driver-ps-blocked\n",
-                       sdata->name, sta->sta.addr, sta->sta.aid);
+                       sta->sdata->name, sta->sta.addr, sta->sta.aid);
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
                return;
        }
@@ -1307,8 +1301,10 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
        sta->rx_fragments++;
        sta->rx_bytes += rx->skb->len;
-        sta->last_signal = status->signal;
+        if (!(status->flag & RX_FLAG_NO_SIGNAL_VAL)) {
-        ewma_add(&sta->avg_signal, -status->signal);
+                sta->last_signal = status->signal;
+                ewma_add(&sta->avg_signal, -status->signal);
+        }
        /*
         * Change STA power saving mode only at the end of a frame
@@ -1955,6 +1951,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
                return RX_DROP_MONITOR;
        }
+        if (!ifmsh->mshcfg.dot11MeshForwarding)
+                goto out;
        fwd_skb = skb_copy(skb, GFP_ATOMIC);
        if (!fwd_skb) {
                if (net_ratelimit())
@@ -2180,12 +2179,14 @@ ieee80211_rx_h_mgmt_check(struct ieee80211_rx_data *rx)
        if (rx->sdata->vif.type == NL80211_IFTYPE_AP &&
            ieee80211_is_beacon(mgmt->frame_control) &&
            !(rx->flags & IEEE80211_RX_BEACON_REPORTED)) {
-                struct ieee80211_rx_status *status;
+                int sig = 0;
+                if (rx->local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
+                        sig = status->signal;
-                status = IEEE80211_SKB_RXCB(rx->skb);
                cfg80211_report_obss_beacon(rx->local->hw.wiphy,
                                            rx->skb->data, rx->skb->len,
-                                            status->freq, GFP_ATOMIC);
+                                            status->freq, sig, GFP_ATOMIC);
                rx->flags |= IEEE80211_RX_BEACON_REPORTED;
        }
@@ -2268,9 +2269,11 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
                        sband = rx->local->hw.wiphy->bands[status->band];
-                        rate_control_rate_update(local, sband, rx->sta,
+                        rate_control_rate_update(
-                                                 IEEE80211_RC_SMPS_CHANGED,
+                                local, sband, rx->sta,
-                                                 local->_oper_channel_type);
+                                IEEE80211_RC_SMPS_CHANGED,
+                                ieee80211_get_tx_channel_type(
+                                        local, local->_oper_channel_type));
                        goto handled;
                }
                default:
@@ -2337,7 +2340,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
                        if (sdata->vif.type != NL80211_IFTYPE_STATION)
                                break;
-                        if (memcmp(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN))
+                        if (compare_ether_addr(mgmt->bssid, sdata->u.mgd.bssid))
                                break;
                        goto queue;
@@ -2409,6 +2412,7 @@ static ieee80211_rx_result debug_noinline
 ieee80211_rx_h_userspace_mgmt(struct ieee80211_rx_data *rx)
 {
        struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(rx->skb);
+        int sig = 0;
        /* skip known-bad action frames and return them in the next handler */
        if (status->rx_flags & IEEE80211_RX_MALFORMED_ACTION_FRM)
@@ -2421,7 +2425,10 @@ ieee80211_rx_h_userspace_mgmt(struct ieee80211_rx_data *rx)
         * it transmitted were processed or returned.
         */
-        if (cfg80211_rx_mgmt(rx->sdata->dev, status->freq,
+        if (rx->local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
+                sig = status->signal;
+        if (cfg80211_rx_mgmt(rx->sdata->dev, status->freq, sig,
                             rx->skb->data, rx->skb->len,
                             GFP_ATOMIC)) {
                if (rx->sta)
@@ -2486,14 +2493,9 @@ static ieee80211_rx_result debug_noinline
 ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)
 {
        struct ieee80211_sub_if_data *sdata = rx->sdata;
-        ieee80211_rx_result rxs;
        struct ieee80211_mgmt *mgmt = (void *)rx->skb->data;
        __le16 stype;
-        rxs = ieee80211_work_rx_mgmt(rx->sdata, rx->skb);
-        if (rxs != RX_CONTINUE)
-                return rxs;
        stype = mgmt->frame_control & cpu_to_le16(IEEE80211_FCTL_STYPE);
        if (!ieee80211_vif_is_mesh(&sdata->vif) &&
@@ -2502,10 +2504,13 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)
                return RX_DROP_MONITOR;
        switch (stype) {
+        case cpu_to_le16(IEEE80211_STYPE_AUTH):
        case cpu_to_le16(IEEE80211_STYPE_BEACON):
        case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
                /* process for all: mesh, mlme, ibss */
                break;
+        case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
+        case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
        case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
        case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
                if (is_multicast_ether_addr(mgmt->da) &&
@@ -2517,7 +2522,6 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)
                        return RX_DROP_MONITOR;
                break;
        case cpu_to_le16(IEEE80211_STYPE_PROBE_REQ):
-        case cpu_to_le16(IEEE80211_STYPE_AUTH):
                /* process only for ibss */
                if (sdata->vif.type != NL80211_IFTYPE_ADHOC)
                        return RX_DROP_MONITOR;
@@ -2542,16 +2546,10 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx,
 {
        struct ieee80211_sub_if_data *sdata;
        struct ieee80211_local *local = rx->local;
-        struct ieee80211_rtap_hdr {
-                struct ieee80211_radiotap_header hdr;
-                u8 flags;
-                u8 rate_or_pad;
-                __le16 chan_freq;
-                __le16 chan_flags;
-        } __packed *rthdr;
        struct sk_buff *skb = rx->skb, *skb2;
        struct net_device *prev_dev = NULL;
        struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
+        int needed_headroom;
        /*
         * If cooked monitor has been processed already, then
@@ -2565,30 +2563,15 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx,
        if (!local->cooked_mntrs)
                goto out_free_skb;
-        if (skb_headroom(skb) < sizeof(*rthdr) &&
+        /* room for the radiotap header based on driver features */
-            pskb_expand_head(skb, sizeof(*rthdr), 0, GFP_ATOMIC))
+        needed_headroom = ieee80211_rx_radiotap_len(local, status);
-                goto out_free_skb;
-        rthdr = (void *)skb_push(skb, sizeof(*rthdr));
-        memset(rthdr, 0, sizeof(*rthdr));
-        rthdr->hdr.it_len = cpu_to_le16(sizeof(*rthdr));
-        rthdr->hdr.it_present =
-                cpu_to_le32((1 << IEEE80211_RADIOTAP_FLAGS) |
-                            (1 << IEEE80211_RADIOTAP_CHANNEL));
-        if (rate) {
+        if (skb_headroom(skb) < needed_headroom &&
-                rthdr->rate_or_pad = rate->bitrate / 5;
+            pskb_expand_head(skb, needed_headroom, 0, GFP_ATOMIC))
-                rthdr->hdr.it_present |=
+                goto out_free_skb;
-                        cpu_to_le32(1 << IEEE80211_RADIOTAP_RATE);
-        }
-        rthdr->chan_freq = cpu_to_le16(status->freq);
-        if (status->band == IEEE80211_BAND_5GHZ)
+        /* prepend radiotap information */
-                rthdr->chan_flags = cpu_to_le16(IEEE80211_CHAN_OFDM |
+        ieee80211_add_rx_radiotap_header(local, skb, rate, needed_headroom);
-                                                IEEE80211_CHAN_5GHZ);
-        else
-                rthdr->chan_flags = cpu_to_le16(IEEE80211_CHAN_DYN |
-                                                IEEE80211_CHAN_2GHZ);
        skb_set_mac_header(skb, 0);
        skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -2956,7 +2939,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
        if (ieee80211_is_data(fc)) {
                prev_sta = NULL;
-                for_each_sta_info_rx(local, hdr->addr2, sta, tmp) {
+                for_each_sta_info(local, hdr->addr2, sta, tmp) {
                        if (!prev_sta) {
                                prev_sta = sta;
                                continue;
@@ -3000,7 +2983,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
                        continue;
                }
-                rx.sta = sta_info_get_bss_rx(prev, hdr->addr2);
+                rx.sta = sta_info_get_bss(prev, hdr->addr2);
                rx.sdata = prev;
                ieee80211_prepare_and_rx_handle(&rx, skb, false);
@@ -3008,7 +2991,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
        }
        if (prev) {
-                rx.sta = sta_info_get_bss_rx(prev, hdr->addr2);
+                rx.sta = sta_info_get_bss(prev, hdr->addr2);
                rx.sdata = prev;
                if (ieee80211_prepare_and_rx_handle(&rx, skb, true))
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 9270771702fe..33cd16901378 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -13,6 +13,7 @@
 */
 #include <linux/if_arp.h>
+#include <linux/etherdevice.h>
 #include <linux/rtnetlink.h>
 #include <linux/pm_qos.h>
 #include <net/sch_generic.h>
@@ -103,16 +104,35 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
        cbss->free_priv = ieee80211_rx_bss_free;
        bss = (void *)cbss->priv;
+        if (elems->parse_error) {
+                if (beacon)
+                        bss->corrupt_data |= IEEE80211_BSS_CORRUPT_BEACON;
+                else
+                        bss->corrupt_data |= IEEE80211_BSS_CORRUPT_PROBE_RESP;
+        } else {
+                if (beacon)
+                        bss->corrupt_data &= ~IEEE80211_BSS_CORRUPT_BEACON;
+                else
+                        bss->corrupt_data &= ~IEEE80211_BSS_CORRUPT_PROBE_RESP;
+        }
        /* save the ERP value so that it is available at association time */
-        if (elems->erp_info && elems->erp_info_len >= 1) {
+        if (elems->erp_info && elems->erp_info_len >= 1 &&
+                        (!elems->parse_error ||
+                         !(bss->valid_data & IEEE80211_BSS_VALID_ERP))) {
                bss->erp_value = elems->erp_info[0];
                bss->has_erp_value = true;
+                if (!elems->parse_error)
+                        bss->valid_data |= IEEE80211_BSS_VALID_ERP;
        }
-        if (elems->tim) {
+        if (elems->tim && (!elems->parse_error ||
+                           !(bss->valid_data & IEEE80211_BSS_VALID_DTIM))) {
                struct ieee80211_tim_ie *tim_ie =
                        (struct ieee80211_tim_ie *)elems->tim;
                bss->dtim_period = tim_ie->dtim_period;
+                if (!elems->parse_error)
+                                bss->valid_data |= IEEE80211_BSS_VALID_DTIM;
        }
        /* If the beacon had no TIM IE, or it was invalid, use 1 */
@@ -120,26 +140,38 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
                bss->dtim_period = 1;
        /* replace old supported rates if we get new values */
-        srlen = 0;
+        if (!elems->parse_error ||
-        if (elems->supp_rates) {
+            !(bss->valid_data & IEEE80211_BSS_VALID_RATES)) {
-                clen = IEEE80211_MAX_SUPP_RATES;
+                srlen = 0;
-                if (clen > elems->supp_rates_len)
+                if (elems->supp_rates) {
-                        clen = elems->supp_rates_len;
+                        clen = IEEE80211_MAX_SUPP_RATES;
-                memcpy(bss->supp_rates, elems->supp_rates, clen);
+                        if (clen > elems->supp_rates_len)
-                srlen += clen;
+                                clen = elems->supp_rates_len;
-        }
+                        memcpy(bss->supp_rates, elems->supp_rates, clen);
-        if (elems->ext_supp_rates) {
+                        srlen += clen;
-                clen = IEEE80211_MAX_SUPP_RATES - srlen;
+                }
-                if (clen > elems->ext_supp_rates_len)
+                if (elems->ext_supp_rates) {
-                        clen = elems->ext_supp_rates_len;
+                        clen = IEEE80211_MAX_SUPP_RATES - srlen;
-                memcpy(bss->supp_rates + srlen, elems->ext_supp_rates, clen);
+                        if (clen > elems->ext_supp_rates_len)
-                srlen += clen;
+                                clen = elems->ext_supp_rates_len;
+                        memcpy(bss->supp_rates + srlen, elems->ext_supp_rates,
+                               clen);
+                        srlen += clen;
+                }
+                if (srlen) {
+                        bss->supp_rates_len = srlen;
+                        if (!elems->parse_error)
+                                bss->valid_data |= IEEE80211_BSS_VALID_RATES;
+                }
        }
-        if (srlen)
-                bss->supp_rates_len = srlen;
-        bss->wmm_used = elems->wmm_param || elems->wmm_info;
+        if (!elems->parse_error ||
-        bss->uapsd_supported = is_uapsd_supported(elems);
+            !(bss->valid_data & IEEE80211_BSS_VALID_WMM)) {
+                bss->wmm_used = elems->wmm_param || elems->wmm_info;
+                bss->uapsd_supported = is_uapsd_supported(elems);
+                if (!elems->parse_error)
+                        bss->valid_data |= IEEE80211_BSS_VALID_WMM;
+        }
        if (!beacon)
                bss->last_probe_resp = jiffies;
@@ -176,7 +208,7 @@ ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)
        presp = ieee80211_is_probe_resp(fc);
        if (presp) {
                /* ignore ProbeResp to foreign address */
-                if (memcmp(mgmt->da, sdata->vif.addr, ETH_ALEN))
+                if (compare_ether_addr(mgmt->da, sdata->vif.addr))
                        return RX_DROP_MONITOR;
                presp = true;
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index ff11f6bf8266..38137cb5f6f0 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -9,6 +9,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/etherdevice.h>
 #include <linux/netdevice.h>
 #include <linux/types.h>
 #include <linux/slab.h>
@@ -100,27 +101,8 @@ struct sta_info *sta_info_get(struct ieee80211_sub_if_data *sdata,
        sta = rcu_dereference_check(local->sta_hash[STA_HASH(addr)],
                                    lockdep_is_held(&local->sta_mtx));
        while (sta) {
-                if (sta->sdata == sdata && !sta->dummy &&
-                    memcmp(sta->sta.addr, addr, ETH_ALEN) == 0)
-                        break;
-                sta = rcu_dereference_check(sta->hnext,
-                                            lockdep_is_held(&local->sta_mtx));
-        }
-        return sta;
-}
-/* get a station info entry even if it is a dummy station*/
-struct sta_info *sta_info_get_rx(struct ieee80211_sub_if_data *sdata,
-                              const u8 *addr)
-{
-        struct ieee80211_local *local = sdata->local;
-        struct sta_info *sta;
-        sta = rcu_dereference_check(local->sta_hash[STA_HASH(addr)],
-                                    lockdep_is_held(&local->sta_mtx));
-        while (sta) {
                if (sta->sdata == sdata &&
-                    memcmp(sta->sta.addr, addr, ETH_ALEN) == 0)
+                    compare_ether_addr(sta->sta.addr, addr) == 0)
                        break;
                sta = rcu_dereference_check(sta->hnext,
                                            lockdep_is_held(&local->sta_mtx));
@@ -143,31 +125,7 @@ struct sta_info *sta_info_get_bss(struct ieee80211_sub_if_data *sdata,
        while (sta) {
                if ((sta->sdata == sdata ||
                     (sta->sdata->bss && sta->sdata->bss == sdata->bss)) &&
-                    !sta->dummy &&
+                    compare_ether_addr(sta->sta.addr, addr) == 0)
-                    memcmp(sta->sta.addr, addr, ETH_ALEN) == 0)
-                        break;
-                sta = rcu_dereference_check(sta->hnext,
-                                            lockdep_is_held(&local->sta_mtx));
-        }
-        return sta;
-}
-/*
- * Get sta info either from the specified interface
- * or from one of its vlans (including dummy stations)
- */
-struct sta_info *sta_info_get_bss_rx(struct ieee80211_sub_if_data *sdata,
-                                  const u8 *addr)
-{
-        struct ieee80211_local *local = sdata->local;
-        struct sta_info *sta;
-        sta = rcu_dereference_check(local->sta_hash[STA_HASH(addr)],
-                                    lockdep_is_held(&local->sta_mtx));
-        while (sta) {
-                if ((sta->sdata == sdata ||
-                     (sta->sdata->bss && sta->sdata->bss == sdata->bss)) &&
-                    memcmp(sta->sta.addr, addr, ETH_ALEN) == 0)
                        break;
                sta = rcu_dereference_check(sta->hnext,
                                            lockdep_is_held(&local->sta_mtx));
@@ -208,10 +166,8 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata,
 */
 void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
 {
-        if (sta->rate_ctrl) {
+        if (sta->rate_ctrl)
                rate_control_free_sta(sta);
-                rate_control_put(sta->rate_ctrl);
-        }
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
        wiphy_debug(local->hw.wiphy, "Destroyed STA %pM\n", sta->sta.addr);
@@ -264,13 +220,11 @@ static int sta_prepare_rate_control(struct ieee80211_local *local,
        if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL)
                return 0;
-        sta->rate_ctrl = rate_control_get(local->rate_ctrl);
+        sta->rate_ctrl = local->rate_ctrl;
        sta->rate_ctrl_priv = rate_control_alloc_sta(sta->rate_ctrl,
                                                     &sta->sta, gfp);
-        if (!sta->rate_ctrl_priv) {
+        if (!sta->rate_ctrl_priv)
-                rate_control_put(sta->rate_ctrl);
                return -ENOMEM;
-        }
        return 0;
 }
@@ -297,6 +251,8 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
        sta->sdata = sdata;
        sta->last_rx = jiffies;
+        sta->sta_state = IEEE80211_STA_NONE;
        do_posix_clock_monotonic_gettime(&uptime);
        sta->last_connected = uptime.tv_sec;
        ewma_init(&sta->avg_signal, 1024, 8);
@@ -353,6 +309,43 @@ static int sta_info_insert_check(struct sta_info *sta)
        return 0;
 }
+static int sta_info_insert_drv_state(struct ieee80211_local *local,
+                                     struct ieee80211_sub_if_data *sdata,
+                                     struct sta_info *sta)
+{
+        enum ieee80211_sta_state state;
+        int err = 0;
+        for (state = IEEE80211_STA_NOTEXIST; state < sta->sta_state; state++) {
+                err = drv_sta_state(local, sdata, sta, state, state + 1);
+                if (err)
+                        break;
+        }
+        if (!err) {
+                /*
+                 * Drivers using legacy sta_add/sta_remove callbacks only
+                 * get uploaded set to true after sta_add is called.
+                 */
+                if (!local->ops->sta_add)
+                        sta->uploaded = true;
+                return 0;
+        }
+        if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
+                printk(KERN_DEBUG
+                       "%s: failed to move IBSS STA %pM to state %d (%d) - keeping it anyway.\n",
+                       sdata->name, sta->sta.addr, state + 1, err);
+                err = 0;
+        }
+        /* unwind on error */
+        for (; state > IEEE80211_STA_NOTEXIST; state--)
+                WARN_ON(drv_sta_state(local, sdata, sta, state, state - 1));
+        return err;
+}
 /*
 * should be called with sta_mtx locked
 * this function replaces the mutex lock
@@ -362,70 +355,43 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
 {
        struct ieee80211_local *local = sta->local;
        struct ieee80211_sub_if_data *sdata = sta->sdata;
-        struct sta_info *exist_sta;
+        struct station_info sinfo;
-        bool dummy_reinsert = false;
        int err = 0;
        lockdep_assert_held(&local->sta_mtx);
-        /*
+        /* check if STA exists already */
-         * check if STA exists already.
+        if (sta_info_get_bss(sdata, sta->sta.addr)) {
-         * only accept a scenario of a second call to sta_info_insert_finish
+                err = -EEXIST;
-         * with a dummy station entry that was inserted earlier
+                goto out_err;
-         * in that case - assume that the dummy station flag should
-         * be removed.
-         */
-        exist_sta = sta_info_get_bss_rx(sdata, sta->sta.addr);
-        if (exist_sta) {
-                if (exist_sta == sta && sta->dummy) {
-                        dummy_reinsert = true;
-                } else {
-                        err = -EEXIST;
-                        goto out_err;
-                }
        }
-        if (!sta->dummy || dummy_reinsert) {
+        /* notify driver */
-                /* notify driver */
+        err = sta_info_insert_drv_state(local, sdata, sta);
-                err = drv_sta_add(local, sdata, &sta->sta);
+        if (err)
-                if (err) {
+                goto out_err;
-                        if (sdata->vif.type != NL80211_IFTYPE_ADHOC)
-                                goto out_err;
-                        printk(KERN_DEBUG "%s: failed to add IBSS STA %pM to "
-                                          "driver (%d) - keeping it anyway.\n",
-                               sdata->name, sta->sta.addr, err);
-                } else
-                        sta->uploaded = true;
-        }
-        if (!dummy_reinsert) {
+        local->num_sta++;
-                local->num_sta++;
+        local->sta_generation++;
-                local->sta_generation++;
+        smp_mb();
-                smp_mb();
-                /* make the station visible */
+        /* make the station visible */
-                sta_info_hash_add(local, sta);
+        sta_info_hash_add(local, sta);
-                list_add(&sta->list, &local->sta_list);
+        list_add(&sta->list, &local->sta_list);
-        } else {
-                sta->dummy = false;
-        }
-        if (!sta->dummy) {
+        set_sta_flag(sta, WLAN_STA_INSERTED);
-                struct station_info sinfo;
-                ieee80211_sta_debugfs_add(sta);
+        ieee80211_sta_debugfs_add(sta);
-                rate_control_add_sta_debugfs(sta);
+        rate_control_add_sta_debugfs(sta);
-                memset(&sinfo, 0, sizeof(sinfo));
+        memset(&sinfo, 0, sizeof(sinfo));
-                sinfo.filled = 0;
+        sinfo.filled = 0;
-                sinfo.generation = local->sta_generation;
+        sinfo.generation = local->sta_generation;
-                cfg80211_new_sta(sdata->dev, sta->sta.addr, &sinfo, GFP_KERNEL);
+        cfg80211_new_sta(sdata->dev, sta->sta.addr, &sinfo, GFP_KERNEL);
-        }
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "Inserted %sSTA %pM\n",
+        wiphy_debug(local->hw.wiphy, "Inserted STA %pM\n", sta->sta.addr);
-                        sta->dummy ? "dummy " : "", sta->sta.addr);
 #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
        /* move reference to rcu-protected */
@@ -477,25 +443,6 @@ int sta_info_insert(struct sta_info *sta)
        return err;
 }
-/* Caller must hold sta->local->sta_mtx */
-int sta_info_reinsert(struct sta_info *sta)
-{
-        struct ieee80211_local *local = sta->local;
-        int err = 0;
-        err = sta_info_insert_check(sta);
-        if (err) {
-                mutex_unlock(&local->sta_mtx);
-                return err;
-        }
-        might_sleep();
-        err = sta_info_insert_finish(sta);
-        rcu_read_unlock();
-        return err;
-}
 static inline void __bss_tim_set(struct ieee80211_if_ap *bss, u16 aid)
 {
        /*
@@ -711,7 +658,7 @@ static bool sta_info_cleanup_expire_buffered(struct ieee80211_local *local,
        return have_buffered;
 }
-static int __must_check __sta_info_destroy(struct sta_info *sta)
+int __must_check __sta_info_destroy(struct sta_info *sta)
 {
        struct ieee80211_local *local;
        struct ieee80211_sub_if_data *sdata;
@@ -726,6 +673,8 @@ static int __must_check __sta_info_destroy(struct sta_info *sta)
        local = sta->local;
        sdata = sta->sdata;
+        lockdep_assert_held(&local->sta_mtx);
        /*
         * Before removing the station from the driver and
         * rate control, it might still start new aggregation
@@ -750,33 +699,24 @@ static int __must_check __sta_info_destroy(struct sta_info *sta)
        sta->dead = true;
-        if (test_sta_flag(sta, WLAN_STA_PS_STA) ||
-            test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
-                BUG_ON(!sdata->bss);
-                clear_sta_flag(sta, WLAN_STA_PS_STA);
-                clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
-                atomic_dec(&sdata->bss->num_sta_ps);
-                sta_info_recalc_tim(sta);
-        }
        local->num_sta--;
        local->sta_generation++;
        if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
                RCU_INIT_POINTER(sdata->u.vlan.sta, NULL);
-        while (sta->sta_state > IEEE80211_STA_NONE)
+        while (sta->sta_state > IEEE80211_STA_NONE) {
-                sta_info_move_state(sta, sta->sta_state - 1);
+                ret = sta_info_move_state(sta, sta->sta_state - 1);
+                if (ret) {
+                        WARN_ON_ONCE(1);
+                        break;
+                }
+        }
        if (sta->uploaded) {
-                if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
+                ret = drv_sta_state(local, sdata, sta, IEEE80211_STA_NONE,
-                        sdata = container_of(sdata->bss,
+                                    IEEE80211_STA_NOTEXIST);
-                                             struct ieee80211_sub_if_data,
+                WARN_ON_ONCE(ret != 0);
-                                             u.ap);
-                drv_sta_remove(local, sdata, &sta->sta);
-                sdata = sta->sdata;
        }
        /*
@@ -787,6 +727,15 @@ static int __must_check __sta_info_destroy(struct sta_info *sta)
         */
        synchronize_rcu();
+        if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
+                BUG_ON(!sdata->bss);
+                clear_sta_flag(sta, WLAN_STA_PS_STA);
+                atomic_dec(&sdata->bss->num_sta_ps);
+                sta_info_recalc_tim(sta);
+        }
        for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
                local->total_ps_buffered -= skb_queue_len(&sta->ps_tx_buf[ac]);
                __skb_queue_purge(&sta->ps_tx_buf[ac]);
@@ -815,35 +764,20 @@ static int __must_check __sta_info_destroy(struct sta_info *sta)
        }
 #endif
-        /* There could be some memory leaks because of ampdu tx pending queue
+        /*
-         * not being freed before destroying the station info.
+         * Destroy aggregation state here. It would be nice to wait for the
-         *
+         * driver to finish aggregation stop and then clean up, but for now
-         * Make sure that such queues are purged before freeing the station
+         * drivers have to handle aggregation stop being requested, followed
-         * info.
+         * directly by station destruction.
-         * TODO: We have to somehow postpone the full destruction
-         * until the aggregation stop completes. Refer
-         * http://thread.gmane.org/gmane.linux.kernel.wireless.general/81936
         */
-        mutex_lock(&sta->ampdu_mlme.mtx);
        for (i = 0; i < STA_TID_NUM; i++) {
-                tid_tx = rcu_dereference_protected_tid_tx(sta, i);
+                tid_tx = rcu_dereference_raw(sta->ampdu_mlme.tid_tx[i]);
                if (!tid_tx)
                        continue;
-                if (skb_queue_len(&tid_tx->pending)) {
+                __skb_queue_purge(&tid_tx->pending);
-#ifdef CONFIG_MAC80211_HT_DEBUG
+                kfree(tid_tx);
-                        wiphy_debug(local->hw.wiphy, "TX A-MPDU  purging %d "
-                                "packets for tid=%d\n",
-                                skb_queue_len(&tid_tx->pending), i);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
-                        __skb_queue_purge(&tid_tx->pending);
-                }
-                kfree_rcu(tid_tx, rcu_head);
        }
-        mutex_unlock(&sta->ampdu_mlme.mtx);
        sta_info_free(local, sta);
        return 0;
@@ -855,7 +789,7 @@ int sta_info_destroy_addr(struct ieee80211_sub_if_data *sdata, const u8 *addr)
        int ret;
        mutex_lock(&sdata->local->sta_mtx);
-        sta = sta_info_get_rx(sdata, addr);
+        sta = sta_info_get(sdata, addr);
        ret = __sta_info_destroy(sta);
        mutex_unlock(&sdata->local->sta_mtx);
@@ -869,7 +803,7 @@ int sta_info_destroy_addr_bss(struct ieee80211_sub_if_data *sdata,
        int ret;
        mutex_lock(&sdata->local->sta_mtx);
-        sta = sta_info_get_bss_rx(sdata, addr);
+        sta = sta_info_get_bss(sdata, addr);
        ret = __sta_info_destroy(sta);
        mutex_unlock(&sdata->local->sta_mtx);
@@ -932,8 +866,10 @@ int sta_info_flush(struct ieee80211_local *local,
        mutex_lock(&local->sta_mtx);
        list_for_each_entry_safe(sta, tmp, &local->sta_list, list) {
-                if (!sdata || sdata == sta->sdata)
+                if (!sdata || sdata == sta->sdata) {
                        WARN_ON(__sta_info_destroy(sta));
+                        ret++;
+                }
        }
        mutex_unlock(&local->sta_mtx);
@@ -1009,9 +945,11 @@ EXPORT_SYMBOL(ieee80211_find_sta);
 static void clear_sta_ps_flags(void *_sta)
 {
        struct sta_info *sta = _sta;
+        struct ieee80211_sub_if_data *sdata = sta->sdata;
        clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
-        clear_sta_flag(sta, WLAN_STA_PS_STA);
+        if (test_and_clear_sta_flag(sta, WLAN_STA_PS_STA))
+                atomic_dec(&sdata->bss->num_sta_ps);
 }
 /* powersave support code */
@@ -1113,7 +1051,7 @@ static void ieee80211_send_null_response(struct ieee80211_sub_if_data *sdata,
         * exchange. Also set EOSP to indicate this packet
         * ends the poll/service period.
         */
-        info->flags |= IEEE80211_TX_CTL_POLL_RESPONSE |
+        info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER |
                       IEEE80211_TX_STATUS_EOSP |
                       IEEE80211_TX_CTL_REQ_TX_STATUS;
@@ -1240,7 +1178,7 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
                         * STA may still remain is PS mode after this frame
                         * exchange.
                         */
-                        info->flags |= IEEE80211_TX_CTL_POLL_RESPONSE;
+                        info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
                        /*
                         * Use MoreData flag to indicate whether there are
@@ -1410,28 +1348,68 @@ void ieee80211_sta_set_buffered(struct ieee80211_sta *pubsta,
 }
 EXPORT_SYMBOL(ieee80211_sta_set_buffered);
-int sta_info_move_state_checked(struct sta_info *sta,
+int sta_info_move_state(struct sta_info *sta,
-                                enum ieee80211_sta_state new_state)
+                        enum ieee80211_sta_state new_state)
 {
        might_sleep();
        if (sta->sta_state == new_state)
                return 0;
+        /* check allowed transitions first */
+        switch (new_state) {
+        case IEEE80211_STA_NONE:
+                if (sta->sta_state != IEEE80211_STA_AUTH)
+                        return -EINVAL;
+                break;
+        case IEEE80211_STA_AUTH:
+                if (sta->sta_state != IEEE80211_STA_NONE &&
+                    sta->sta_state != IEEE80211_STA_ASSOC)
+                        return -EINVAL;
+                break;
+        case IEEE80211_STA_ASSOC:
+                if (sta->sta_state != IEEE80211_STA_AUTH &&
+                    sta->sta_state != IEEE80211_STA_AUTHORIZED)
+                        return -EINVAL;
+                break;
+        case IEEE80211_STA_AUTHORIZED:
+                if (sta->sta_state != IEEE80211_STA_ASSOC)
+                        return -EINVAL;
+                break;
+        default:
+                WARN(1, "invalid state %d", new_state);
+                return -EINVAL;
+        }
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+        printk(KERN_DEBUG "%s: moving STA %pM to state %d\n",
+                sta->sdata->name, sta->sta.addr, new_state);
+#endif
+        /*
+         * notify the driver before the actual changes so it can
+         * fail the transition
+         */
+        if (test_sta_flag(sta, WLAN_STA_INSERTED)) {
+                int err = drv_sta_state(sta->local, sta->sdata, sta,
+                                        sta->sta_state, new_state);
+                if (err)
+                        return err;
+        }
+        /* reflect the change in all state variables */
        switch (new_state) {
        case IEEE80211_STA_NONE:
                if (sta->sta_state == IEEE80211_STA_AUTH)
                        clear_bit(WLAN_STA_AUTH, &sta->_flags);
-                else
-                        return -EINVAL;
                break;
        case IEEE80211_STA_AUTH:
                if (sta->sta_state == IEEE80211_STA_NONE)
                        set_bit(WLAN_STA_AUTH, &sta->_flags);
                else if (sta->sta_state == IEEE80211_STA_ASSOC)
                        clear_bit(WLAN_STA_ASSOC, &sta->_flags);
-                else
-                        return -EINVAL;
                break;
        case IEEE80211_STA_ASSOC:
                if (sta->sta_state == IEEE80211_STA_AUTH) {
@@ -1440,24 +1418,19 @@ int sta_info_move_state_checked(struct sta_info *sta,
                        if (sta->sdata->vif.type == NL80211_IFTYPE_AP)
                                atomic_dec(&sta->sdata->u.ap.num_sta_authorized);
                        clear_bit(WLAN_STA_AUTHORIZED, &sta->_flags);
-                } else
+                }
-                        return -EINVAL;
                break;
        case IEEE80211_STA_AUTHORIZED:
                if (sta->sta_state == IEEE80211_STA_ASSOC) {
                        if (sta->sdata->vif.type == NL80211_IFTYPE_AP)
                                atomic_inc(&sta->sdata->u.ap.num_sta_authorized);
                        set_bit(WLAN_STA_AUTHORIZED, &sta->_flags);
-                } else
+                }
-                        return -EINVAL;
                break;
        default:
-                WARN(1, "invalid state %d", new_state);
+                break;
-                return -EINVAL;
        }
-        printk(KERN_DEBUG "%s: moving STA %pM to state %d\n",
-                sta->sdata->name, sta->sta.addr, new_state);
        sta->sta_state = new_state;
        return 0;
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index bfed851d0d36..ab0576827baf 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -14,6 +14,7 @@
 #include <linux/if_ether.h>
 #include <linux/workqueue.h>
 #include <linux/average.h>
+#include <linux/etherdevice.h>
 #include "key.h"
 /**
@@ -52,6 +53,7 @@
 * @WLAN_STA_SP: Station is in a service period, so don't try to
 *      reply to other uAPSD trigger frames or PS-Poll.
 * @WLAN_STA_4ADDR_EVENT: 4-addr event was already sent for this frame.
+ * @WLAN_STA_INSERTED: This station is inserted into the hash table.
 * @WLAN_STA_RATE_CONTROL: rate control was initialized for this station.
 */
 enum ieee80211_sta_info_flags {
@@ -72,17 +74,10 @@ enum ieee80211_sta_info_flags {
        WLAN_STA_UAPSD,
        WLAN_STA_SP,
        WLAN_STA_4ADDR_EVENT,
+        WLAN_STA_INSERTED,
        WLAN_STA_RATE_CONTROL,
 };
-enum ieee80211_sta_state {
-        /* NOTE: These need to be ordered correctly! */
-        IEEE80211_STA_NONE,
-        IEEE80211_STA_AUTH,
-        IEEE80211_STA_ASSOC,
-        IEEE80211_STA_AUTHORIZED,
-};
 #define STA_TID_NUM 16
 #define ADDBA_RESP_INTERVAL HZ
 #define HT_AGG_MAX_RETRIES              15
@@ -273,8 +268,6 @@ struct sta_ampdu_mlme {
 * @dead: set to true when sta is unlinked
 * @uploaded: set to true when sta is uploaded to the driver
 * @lost_packets: number of consecutive lost packets
- * @dummy: indicate a dummy station created for receiving
- *      EAP frames before association
 * @sta: station information we share with the driver
 * @sta_state: duplicates information about station state (for debug)
 * @beacon_loss_count: number of times beacon loss has triggered
@@ -372,9 +365,6 @@ struct sta_info {
        unsigned int lost_packets;
        unsigned int beacon_loss_count;
-        /* should be right in front of sta to be in the same cache line */
-        bool dummy;
        /* keep last! */
        struct ieee80211_sta sta;
 };
@@ -429,13 +419,17 @@ static inline int test_and_set_sta_flag(struct sta_info *sta,
        return test_and_set_bit(flag, &sta->_flags);
 }
-int sta_info_move_state_checked(struct sta_info *sta,
+int sta_info_move_state(struct sta_info *sta,
-                                enum ieee80211_sta_state new_state);
+                        enum ieee80211_sta_state new_state);
-static inline void sta_info_move_state(struct sta_info *sta,
+static inline void sta_info_pre_move_state(struct sta_info *sta,
-                                       enum ieee80211_sta_state new_state)
+                                           enum ieee80211_sta_state new_state)
 {
-        int ret = sta_info_move_state_checked(sta, new_state);
+        int ret;
+        WARN_ON_ONCE(test_sta_flag(sta, WLAN_STA_INSERTED));
+        ret = sta_info_move_state(sta, new_state);
        WARN_ON_ONCE(ret);
 }
@@ -472,15 +466,9 @@ rcu_dereference_protected_tid_tx(struct sta_info *sta, int tid)
 struct sta_info *sta_info_get(struct ieee80211_sub_if_data *sdata,
                              const u8 *addr);
-struct sta_info *sta_info_get_rx(struct ieee80211_sub_if_data *sdata,
-                              const u8 *addr);
 struct sta_info *sta_info_get_bss(struct ieee80211_sub_if_data *sdata,
                                  const u8 *addr);
-struct sta_info *sta_info_get_bss_rx(struct ieee80211_sub_if_data *sdata,
-                                  const u8 *addr);
 static inline
 void for_each_sta_info_type_check(struct ieee80211_local *local,
                                  const u8 *addr,
@@ -489,23 +477,7 @@ void for_each_sta_info_type_check(struct ieee80211_local *local,
 {
 }
-#define for_each_sta_info(local, _addr, _sta, nxt)                      \
+#define for_each_sta_info(local, _addr, _sta, nxt)                      \
-        for (   /* initialise loop */                                   \
-                _sta = rcu_dereference(local->sta_hash[STA_HASH(_addr)]),\
-                nxt = _sta ? rcu_dereference(_sta->hnext) : NULL;       \
-                /* typecheck */                                         \
-                for_each_sta_info_type_check(local, (_addr), _sta, nxt),\
-                /* continue condition */                                \
-                _sta;                                                   \
-                /* advance loop */                                      \
-                _sta = nxt,                                             \
-                nxt = _sta ? rcu_dereference(_sta->hnext) : NULL        \
-             )                                                          \
-        /* run code only if address matches and it's not a dummy sta */ \
-        if (memcmp(_sta->sta.addr, (_addr), ETH_ALEN) == 0 &&           \
-                !_sta->dummy)
-#define for_each_sta_info_rx(local, _addr, _sta, nxt)                   \
        for (   /* initialise loop */                                   \
                _sta = rcu_dereference(local->sta_hash[STA_HASH(_addr)]),\
                nxt = _sta ? rcu_dereference(_sta->hnext) : NULL;       \
@@ -518,7 +490,7 @@ void for_each_sta_info_type_check(struct ieee80211_local *local,
                nxt = _sta ? rcu_dereference(_sta->hnext) : NULL        \
             )                                                          \
        /* compare address and run code only if it matches */           \
-        if (memcmp(_sta->sta.addr, (_addr), ETH_ALEN) == 0)
+        if (compare_ether_addr(_sta->sta.addr, (_addr)) == 0)
 /*
 * Get STA info by index, BROKEN!
@@ -544,8 +516,8 @@ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta);
 */
 int sta_info_insert(struct sta_info *sta);
 int sta_info_insert_rcu(struct sta_info *sta) __acquires(RCU);
-int sta_info_reinsert(struct sta_info *sta);
+int __must_check __sta_info_destroy(struct sta_info *sta);
 int sta_info_destroy_addr(struct ieee80211_sub_if_data *sdata,
                          const u8 *addr);
 int sta_info_destroy_addr_bss(struct ieee80211_sub_if_data *sdata,
@@ -557,6 +529,9 @@ void sta_info_init(struct ieee80211_local *local);
 void sta_info_stop(struct ieee80211_local *local);
 int sta_info_flush(struct ieee80211_local *local,
                   struct ieee80211_sub_if_data *sdata);
+void sta_set_rate_info_tx(struct sta_info *sta,
+                          const struct ieee80211_tx_rate *rate,
+                          struct rate_info *rinfo);
 void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,
                          unsigned long exp_time);
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 30c265c98f73..5f8f89e89d6b 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -10,7 +10,9 @@
 */
 #include <linux/export.h>
+#include <linux/etherdevice.h>
 #include <net/mac80211.h>
+#include <asm/unaligned.h>
 #include "ieee80211_i.h"
 #include "rate.h"
 #include "mesh.h"
@@ -350,7 +352,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
        bool send_to_cooked;
        bool acked;
        struct ieee80211_bar *bar;
-        u16 tid;
        int rtap_len;
        for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
@@ -377,7 +378,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
        for_each_sta_info(local, hdr->addr1, sta, tmp) {
                /* skip wrong virtual interface */
-                if (memcmp(hdr->addr2, sta->sdata->vif.addr, ETH_ALEN))
+                if (compare_ether_addr(hdr->addr2, sta->sdata->vif.addr))
                        continue;
                if (info->flags & IEEE80211_TX_STATUS_EOSP)
@@ -412,7 +413,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
                }
                if (!acked && ieee80211_is_back_req(fc)) {
-                        u16 control;
+                        u16 tid, control;
                        /*
                         * BAR failed, store the last SSN and retry sending
@@ -516,7 +517,8 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
                if (ieee80211_is_nullfunc(hdr->frame_control) ||
                    ieee80211_is_qos_nullfunc(hdr->frame_control)) {
-                        bool acked = info->flags & IEEE80211_TX_STAT_ACK;
+                        acked = info->flags & IEEE80211_TX_STAT_ACK;
                        cfg80211_probe_status(skb->dev, hdr->addr1,
                                              cookie, acked, GFP_ATOMIC);
                } else {
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index e05667cd5e76..782a60198df4 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -226,12 +226,12 @@ ieee80211_tx_h_dynamic_ps(struct ieee80211_tx_data *tx)
         * have correct qos tag for some reason, due the network or the
         * peer application.
         *
-         * Note: local->uapsd_queues access is racy here. If the value is
+         * Note: ifmgd->uapsd_queues access is racy here. If the value is
         * changed via debugfs, user needs to reassociate manually to have
         * everything in sync.
         */
        if ((ifmgd->flags & IEEE80211_STA_UAPSD_ENABLED)
-            && (local->uapsd_queues & IEEE80211_WMM_IE_STA_QOSINFO_AC_VO)
+            && (ifmgd->uapsd_queues & IEEE80211_WMM_IE_STA_QOSINFO_AC_VO)
            && skb_get_queue_mapping(tx->skb) == 0)
                return TX_CONTINUE;
@@ -448,18 +448,23 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
        struct ieee80211_local *local = tx->local;
-        if (unlikely(!sta ||
+        if (unlikely(!sta))
-                     ieee80211_is_probe_resp(hdr->frame_control) ||
-                     ieee80211_is_auth(hdr->frame_control) ||
-                     ieee80211_is_assoc_resp(hdr->frame_control) ||
-                     ieee80211_is_reassoc_resp(hdr->frame_control)))
                return TX_CONTINUE;
        if (unlikely((test_sta_flag(sta, WLAN_STA_PS_STA) ||
                      test_sta_flag(sta, WLAN_STA_PS_DRIVER)) &&
-                     !(info->flags & IEEE80211_TX_CTL_POLL_RESPONSE))) {
+                     !(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER))) {
                int ac = skb_get_queue_mapping(tx->skb);
+                /* only deauth, disassoc and action are bufferable MMPDUs */
+                if (ieee80211_is_mgmt(hdr->frame_control) &&
+                    !ieee80211_is_deauth(hdr->frame_control) &&
+                    !ieee80211_is_disassoc(hdr->frame_control) &&
+                    !ieee80211_is_action(hdr->frame_control)) {
+                        info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
+                        return TX_CONTINUE;
+                }
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
                printk(KERN_DEBUG "STA %pM aid %d: PS buffer for AC %d\n",
                       sta->sta.addr, sta->sta.aid, ac);
@@ -625,7 +630,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
                         tx->local->hw.wiphy->frag_threshold);
        /* set up the tx rate control struct we give the RC algo */
-        txrc.hw = local_to_hw(tx->local);
+        txrc.hw = &tx->local->hw;
        txrc.sband = sband;
        txrc.bss_conf = &tx->sdata->vif.bss_conf;
        txrc.skb = tx->skb;
@@ -635,6 +640,9 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
                txrc.max_rate_idx = -1;
        else
                txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1;
+        memcpy(txrc.rate_idx_mcs_mask,
+               tx->sdata->rc_rateidx_mcs_mask[tx->channel->band],
+               sizeof(txrc.rate_idx_mcs_mask));
        txrc.bss = (tx->sdata->vif.type == NL80211_IFTYPE_AP ||
                    tx->sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
                    tx->sdata->vif.type == NL80211_IFTYPE_ADHOC);
@@ -1057,6 +1065,7 @@ static bool ieee80211_tx_prep_agg(struct ieee80211_tx_data *tx,
 {
        bool queued = false;
        bool reset_agg_timer = false;
+        struct sk_buff *purge_skb = NULL;
        if (test_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state)) {
                info->flags |= IEEE80211_TX_CTL_AMPDU;
@@ -1098,8 +1107,13 @@ static bool ieee80211_tx_prep_agg(struct ieee80211_tx_data *tx,
                        info->control.vif = &tx->sdata->vif;
                        info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
                        __skb_queue_tail(&tid_tx->pending, skb);
+                        if (skb_queue_len(&tid_tx->pending) > STA_MAX_TX_BUFFER)
+                                purge_skb = __skb_dequeue(&tid_tx->pending);
                }
                spin_unlock(&tx->sta->lock);
+                if (purge_skb)
+                        dev_kfree_skb(purge_skb);
        }
        /* reset session timer */
@@ -2203,7 +2217,8 @@ void ieee80211_tx_pending(unsigned long data)
 /* functions for drivers to get certain frames */
-static void ieee80211_beacon_add_tim(struct ieee80211_if_ap *bss,
+static void ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata,
+                                     struct ieee80211_if_ap *bss,
                                     struct sk_buff *skb,
                                     struct beacon_data *beacon)
 {
@@ -2220,7 +2235,7 @@ static void ieee80211_beacon_add_tim(struct ieee80211_if_ap *bss,
                                          IEEE80211_MAX_AID+1);
        if (bss->dtim_count == 0)
-                bss->dtim_count = beacon->dtim_period - 1;
+                bss->dtim_count = sdata->vif.bss_conf.dtim_period - 1;
        else
                bss->dtim_count--;
@@ -2228,7 +2243,7 @@ static void ieee80211_beacon_add_tim(struct ieee80211_if_ap *bss,
        *pos++ = WLAN_EID_TIM;
        *pos++ = 4;
        *pos++ = bss->dtim_count;
-        *pos++ = beacon->dtim_period;
+        *pos++ = sdata->vif.bss_conf.dtim_period;
        if (bss->dtim_count == 0 && !skb_queue_empty(&bss->ps_bc_buf))
                aid0 = 1;
@@ -2321,12 +2336,14 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
                         * of the tim bitmap in mac80211 and the driver.
                         */
                        if (local->tim_in_locked_section) {
-                                ieee80211_beacon_add_tim(ap, skb, beacon);
+                                ieee80211_beacon_add_tim(sdata, ap, skb,
+                                                         beacon);
                        } else {
                                unsigned long flags;
                                spin_lock_irqsave(&local->tim_lock, flags);
-                                ieee80211_beacon_add_tim(ap, skb, beacon);
+                                ieee80211_beacon_add_tim(sdata, ap, skb,
+                                                         beacon);
                                spin_unlock_irqrestore(&local->tim_lock, flags);
                        }
@@ -2431,6 +2448,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
                txrc.max_rate_idx = -1;
        else
                txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1;
+        memcpy(txrc.rate_idx_mcs_mask, sdata->rc_rateidx_mcs_mask[band],
+               sizeof(txrc.rate_idx_mcs_mask));
        txrc.bss = true;
        rate_control_get_rate(sdata, NULL, &txrc);
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 9919892575f4..32f7a3b3d43c 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -572,24 +572,40 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
        size_t left = len;
        u8 *pos = start;
        bool calc_crc = filter != 0;
+        DECLARE_BITMAP(seen_elems, 256);
+        bitmap_zero(seen_elems, 256);
        memset(elems, 0, sizeof(*elems));
        elems->ie_start = start;
        elems->total_len = len;
        while (left >= 2) {
                u8 id, elen;
+                bool elem_parse_failed;
                id = *pos++;
                elen = *pos++;
                left -= 2;
-                if (elen > left)
+                if (elen > left) {
+                        elems->parse_error = true;
                        break;
+                }
+                if (id != WLAN_EID_VENDOR_SPECIFIC &&
+                    id != WLAN_EID_QUIET &&
+                    test_bit(id, seen_elems)) {
+                        elems->parse_error = true;
+                        left -= elen;
+                        pos += elen;
+                        continue;
+                }
                if (calc_crc && id < 64 && (filter & (1ULL << id)))
                        crc = crc32_be(crc, pos - 2, elen + 2);
+                elem_parse_failed = false;
                switch (id) {
                case WLAN_EID_SSID:
                        elems->ssid = pos;
@@ -615,7 +631,8 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
                        if (elen >= sizeof(struct ieee80211_tim_ie)) {
                                elems->tim = (void *)pos;
                                elems->tim_len = elen;
-                        }
+                        } else
+                                elem_parse_failed = true;
                        break;
                case WLAN_EID_IBSS_PARAMS:
                        elems->ibss_params = pos;
@@ -664,10 +681,14 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
                case WLAN_EID_HT_CAPABILITY:
                        if (elen >= sizeof(struct ieee80211_ht_cap))
                                elems->ht_cap_elem = (void *)pos;
+                        else
+                                elem_parse_failed = true;
                        break;
                case WLAN_EID_HT_INFORMATION:
                        if (elen >= sizeof(struct ieee80211_ht_info))
                                elems->ht_info_elem = (void *)pos;
+                        else
+                                elem_parse_failed = true;
                        break;
                case WLAN_EID_MESH_ID:
                        elems->mesh_id = pos;
@@ -676,6 +697,8 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
                case WLAN_EID_MESH_CONFIG:
                        if (elen >= sizeof(struct ieee80211_meshconf_ie))
                                elems->mesh_config = (void *)pos;
+                        else
+                                elem_parse_failed = true;
                        break;
                case WLAN_EID_PEER_MGMT:
                        elems->peering = pos;
@@ -696,6 +719,8 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
                case WLAN_EID_RANN:
                        if (elen >= sizeof(struct ieee80211_rann_ie))
                                elems->rann = (void *)pos;
+                        else
+                                elem_parse_failed = true;
                        break;
                case WLAN_EID_CHANNEL_SWITCH:
                        elems->ch_switch_elem = pos;
@@ -724,10 +749,18 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
                        break;
                }
+                if (elem_parse_failed)
+                        elems->parse_error = true;
+                else
+                        set_bit(id, seen_elems);
                left -= elen;
                pos += elen;
        }
+        if (left != 0)
+                elems->parse_error = true;
        return crc;
 }
@@ -737,7 +770,8 @@ void ieee802_11_parse_elems(u8 *start, size_t len,
        ieee802_11_parse_elems_crc(start, len, elems, 0, 0);
 }
-void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata)
+void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
+                               bool bss_notify)
 {
        struct ieee80211_local *local = sdata->local;
        struct ieee80211_tx_queue_params qparam;
@@ -753,7 +787,7 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata)
        use_11b = (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ) &&
                 !(sdata->flags & IEEE80211_SDATA_OPERATING_GMODE);
-        for (queue = 0; queue < local_to_hw(local)->queues; queue++) {
+        for (queue = 0; queue < local->hw.queues; queue++) {
                /* Set defaults according to 802.11-2007 Table 7-37 */
                aCWmax = 1023;
                if (use_11b)
@@ -807,7 +841,9 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata)
        if (sdata->vif.type != NL80211_IFTYPE_MONITOR) {
                sdata->vif.bss_conf.qos =
                        sdata->vif.type != NL80211_IFTYPE_STATION;
-                ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_QOS);
+                if (bss_notify)
+                        ieee80211_bss_info_change_notify(sdata,
+                                                         BSS_CHANGED_QOS);
        }
 }
@@ -829,7 +865,7 @@ void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata,
        else
                sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE;
-        ieee80211_set_wmm_default(sdata);
+        ieee80211_set_wmm_default(sdata, true);
 }
 u32 ieee80211_mandatory_rates(struct ieee80211_local *local,
@@ -862,8 +898,8 @@ u32 ieee80211_mandatory_rates(struct ieee80211_local *local,
 void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
                         u16 transaction, u16 auth_alg,
-                         u8 *extra, size_t extra_len, const u8 *bssid,
+                         u8 *extra, size_t extra_len, const u8 *da,
-                         const u8 *key, u8 key_len, u8 key_idx)
+                         const u8 *bssid, const u8 *key, u8 key_len, u8 key_idx)
 {
        struct ieee80211_local *local = sdata->local;
        struct sk_buff *skb;
@@ -881,7 +917,7 @@ void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
        memset(mgmt, 0, 24 + 6);
        mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
                                          IEEE80211_STYPE_AUTH);
-        memcpy(mgmt->da, bssid, ETH_ALEN);
+        memcpy(mgmt->da, da, ETH_ALEN);
        memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
        memcpy(mgmt->bssid, bssid, ETH_ALEN);
        mgmt->u.auth.auth_alg = cpu_to_le16(auth_alg);
@@ -1185,13 +1221,12 @@ int ieee80211_reconfig(struct ieee80211_local *local)
        mutex_lock(&local->sta_mtx);
        list_for_each_entry(sta, &local->sta_list, list) {
                if (sta->uploaded) {
-                        sdata = sta->sdata;
+                        enum ieee80211_sta_state state;
-                        if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
-                                sdata = container_of(sdata->bss,
-                                             struct ieee80211_sub_if_data,
-                                             u.ap);
-                        WARN_ON(drv_sta_add(local, sdata, &sta->sta));
+                        for (state = IEEE80211_STA_NOTEXIST;
+                             state < sta->sta_state - 1; state++)
+                                WARN_ON(drv_sta_state(local, sta->sdata, sta,
+                                                      state, state + 1));
                }
        }
        mutex_unlock(&local->sta_mtx);
@@ -1272,6 +1307,21 @@ int ieee80211_reconfig(struct ieee80211_local *local)
        ieee80211_recalc_ps(local, -1);
        /*
+         * The sta might be in psm against the ap (e.g. because
+         * this was the state before a hw restart), so we
+         * explicitly send a null packet in order to make sure
+         * it'll sync against the ap (and get out of psm).
+         */
+        if (!(local->hw.conf.flags & IEEE80211_CONF_PS)) {
+                list_for_each_entry(sdata, &local->interfaces, list) {
+                        if (sdata->vif.type != NL80211_IFTYPE_STATION)
+                                continue;
+                        ieee80211_send_nullfunc(local, sdata, 0);
+                }
+        }
+        /*
         * Clear the WLAN_STA_BLOCK_BA flag so new aggregation
         * sessions can be established after a resume.
         *
diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c
index 68ad351479df..7aa31bbfaa3b 100644
--- a/net/mac80211/wep.c
+++ b/net/mac80211/wep.c
@@ -263,16 +263,14 @@ static int ieee80211_wep_decrypt(struct ieee80211_local *local,
 }
-bool ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key)
+static bool ieee80211_wep_is_weak_iv(struct sk_buff *skb,
+                                     struct ieee80211_key *key)
 {
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
        unsigned int hdrlen;
        u8 *ivpos;
        u32 iv;
-        if (!ieee80211_has_protected(hdr->frame_control))
-                return false;
        hdrlen = ieee80211_hdrlen(hdr->frame_control);
        ivpos = skb->data + hdrlen;
        iv = (ivpos[0] << 16) | (ivpos[1] << 8) | ivpos[2];
@@ -286,18 +284,27 @@ ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx)
        struct sk_buff *skb = rx->skb;
        struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+        __le16 fc = hdr->frame_control;
-        if (!ieee80211_is_data(hdr->frame_control) &&
+        if (!ieee80211_is_data(fc) && !ieee80211_is_auth(fc))
-            !ieee80211_is_auth(hdr->frame_control))
                return RX_CONTINUE;
        if (!(status->flag & RX_FLAG_DECRYPTED)) {
+                if (skb_linearize(rx->skb))
+                        return RX_DROP_UNUSABLE;
+                if (rx->sta && ieee80211_wep_is_weak_iv(rx->skb, rx->key))
+                        rx->sta->wep_weak_iv_count++;
                if (ieee80211_wep_decrypt(rx->local, rx->skb, rx->key))
                        return RX_DROP_UNUSABLE;
        } else if (!(status->flag & RX_FLAG_IV_STRIPPED)) {
+                if (!pskb_may_pull(rx->skb, ieee80211_hdrlen(fc) + WEP_IV_LEN))
+                        return RX_DROP_UNUSABLE;
+                if (rx->sta && ieee80211_wep_is_weak_iv(rx->skb, rx->key))
+                        rx->sta->wep_weak_iv_count++;
                ieee80211_wep_remove_iv(rx->local, rx->skb, rx->key);
                /* remove ICV */
-                skb_trim(rx->skb, rx->skb->len - WEP_ICV_LEN);
+                if (pskb_trim(rx->skb, rx->skb->len - WEP_ICV_LEN))
+                        return RX_DROP_UNUSABLE;
        }
        return RX_CONTINUE;
diff --git a/net/mac80211/wep.h b/net/mac80211/wep.h
index 01e54840a628..9615749d1f65 100644
--- a/net/mac80211/wep.h
+++ b/net/mac80211/wep.h
@@ -25,7 +25,6 @@ int ieee80211_wep_encrypt(struct ieee80211_local *local,
                          const u8 *key, int keylen, int keyidx);
 int ieee80211_wep_decrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
                               size_t klen, u8 *data, size_t data_len);
-bool ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key);
 ieee80211_rx_result
 ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx);
diff --git a/net/mac80211/work.c b/net/mac80211/work.c
index c6dd01a05291..c6e230efa049 100644
--- a/net/mac80211/work.c
+++ b/net/mac80211/work.c
@@ -27,16 +27,9 @@
 #include "rate.h"
 #include "driver-ops.h"
-#define IEEE80211_AUTH_TIMEOUT (HZ / 5)
-#define IEEE80211_AUTH_MAX_TRIES 3
-#define IEEE80211_ASSOC_TIMEOUT (HZ / 5)
-#define IEEE80211_ASSOC_MAX_TRIES 3
 enum work_action {
-        WORK_ACT_MISMATCH,
        WORK_ACT_NONE,
        WORK_ACT_TIMEOUT,
-        WORK_ACT_DONE,
 };
@@ -71,464 +64,6 @@ void free_work(struct ieee80211_work *wk)
        kfree_rcu(wk, rcu_head);
 }
-static int ieee80211_compatible_rates(const u8 *supp_rates, int supp_rates_len,
-                                      struct ieee80211_supported_band *sband,
-                                      u32 *rates)
-{
-        int i, j, count;
-        *rates = 0;
-        count = 0;
-        for (i = 0; i < supp_rates_len; i++) {
-                int rate = (supp_rates[i] & 0x7F) * 5;
-                for (j = 0; j < sband->n_bitrates; j++)
-                        if (sband->bitrates[j].bitrate == rate) {
-                                *rates |= BIT(j);
-                                count++;
-                                break;
-                        }
-        }
-        return count;
-}
-/* frame sending functions */
-static void ieee80211_add_ht_ie(struct ieee80211_sub_if_data *sdata,
-                                struct sk_buff *skb, const u8 *ht_info_ie,
-                                struct ieee80211_supported_band *sband,
-                                struct ieee80211_channel *channel,
-                                enum ieee80211_smps_mode smps)
-{
-        struct ieee80211_ht_info *ht_info;
-        u8 *pos;
-        u32 flags = channel->flags;
-        u16 cap;
-        struct ieee80211_sta_ht_cap ht_cap;
-        BUILD_BUG_ON(sizeof(ht_cap) != sizeof(sband->ht_cap));
-        if (!sband->ht_cap.ht_supported)
-                return;
-        if (!ht_info_ie)
-                return;
-        if (ht_info_ie[1] < sizeof(struct ieee80211_ht_info))
-                return;
-        memcpy(&ht_cap, &sband->ht_cap, sizeof(ht_cap));
-        ieee80211_apply_htcap_overrides(sdata, &ht_cap);
-        ht_info = (struct ieee80211_ht_info *)(ht_info_ie + 2);
-        /* determine capability flags */
-        cap = ht_cap.cap;
-        switch (ht_info->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
-        case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
-                if (flags & IEEE80211_CHAN_NO_HT40PLUS) {
-                        cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
-                        cap &= ~IEEE80211_HT_CAP_SGI_40;
-                }
-                break;
-        case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
-                if (flags & IEEE80211_CHAN_NO_HT40MINUS) {
-                        cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
-                        cap &= ~IEEE80211_HT_CAP_SGI_40;
-                }
-                break;
-        }
-        /* set SM PS mode properly */
-        cap &= ~IEEE80211_HT_CAP_SM_PS;
-        switch (smps) {
-        case IEEE80211_SMPS_AUTOMATIC:
-        case IEEE80211_SMPS_NUM_MODES:
-                WARN_ON(1);
-        case IEEE80211_SMPS_OFF:
-                cap |= WLAN_HT_CAP_SM_PS_DISABLED <<
-                        IEEE80211_HT_CAP_SM_PS_SHIFT;
-                break;
-        case IEEE80211_SMPS_STATIC:
-                cap |= WLAN_HT_CAP_SM_PS_STATIC <<
-                        IEEE80211_HT_CAP_SM_PS_SHIFT;
-                break;
-        case IEEE80211_SMPS_DYNAMIC:
-                cap |= WLAN_HT_CAP_SM_PS_DYNAMIC <<
-                        IEEE80211_HT_CAP_SM_PS_SHIFT;
-                break;
-        }
-        /* reserve and fill IE */
-        pos = skb_put(skb, sizeof(struct ieee80211_ht_cap) + 2);
-        ieee80211_ie_build_ht_cap(pos, &ht_cap, cap);
-}
-static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata,
-                                 struct ieee80211_work *wk)
-{
-        struct ieee80211_local *local = sdata->local;
-        struct sk_buff *skb;
-        struct ieee80211_mgmt *mgmt;
-        u8 *pos, qos_info;
-        size_t offset = 0, noffset;
-        int i, count, rates_len, supp_rates_len;
-        u16 capab;
-        struct ieee80211_supported_band *sband;
-        u32 rates = 0;
-        sband = local->hw.wiphy->bands[wk->chan->band];
-        if (wk->assoc.supp_rates_len) {
-                /*
-                 * Get all rates supported by the device and the AP as
-                 * some APs don't like getting a superset of their rates
-                 * in the association request (e.g. D-Link DAP 1353 in
-                 * b-only mode)...
-                 */
-                rates_len = ieee80211_compatible_rates(wk->assoc.supp_rates,
-                                                       wk->assoc.supp_rates_len,
-                                                       sband, &rates);
-        } else {
-                /*
-                 * In case AP not provide any supported rates information
-                 * before association, we send information element(s) with
-                 * all rates that we support.
-                 */
-                rates = ~0;
-                rates_len = sband->n_bitrates;
-        }
-        skb = alloc_skb(local->hw.extra_tx_headroom +
-                        sizeof(*mgmt) + /* bit too much but doesn't matter */
-                        2 + wk->assoc.ssid_len + /* SSID */
-                        4 + rates_len + /* (extended) rates */
-                        4 + /* power capability */
-                        2 + 2 * sband->n_channels + /* supported channels */
-                        2 + sizeof(struct ieee80211_ht_cap) + /* HT */
-                        wk->ie_len + /* extra IEs */
-                        9, /* WMM */
-                        GFP_KERNEL);
-        if (!skb)
-                return;
-        skb_reserve(skb, local->hw.extra_tx_headroom);
-        capab = WLAN_CAPABILITY_ESS;
-        if (sband->band == IEEE80211_BAND_2GHZ) {
-                if (!(local->hw.flags & IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE))
-                        capab |= WLAN_CAPABILITY_SHORT_SLOT_TIME;
-                if (!(local->hw.flags & IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE))
-                        capab |= WLAN_CAPABILITY_SHORT_PREAMBLE;
-        }
-        if (wk->assoc.capability & WLAN_CAPABILITY_PRIVACY)
-                capab |= WLAN_CAPABILITY_PRIVACY;
-        if ((wk->assoc.capability & WLAN_CAPABILITY_SPECTRUM_MGMT) &&
-            (local->hw.flags & IEEE80211_HW_SPECTRUM_MGMT))
-                capab |= WLAN_CAPABILITY_SPECTRUM_MGMT;
-        mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24);
-        memset(mgmt, 0, 24);
-        memcpy(mgmt->da, wk->filter_ta, ETH_ALEN);
-        memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
-        memcpy(mgmt->bssid, wk->filter_ta, ETH_ALEN);
-        if (!is_zero_ether_addr(wk->assoc.prev_bssid)) {
-                skb_put(skb, 10);
-                mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                                                  IEEE80211_STYPE_REASSOC_REQ);
-                mgmt->u.reassoc_req.capab_info = cpu_to_le16(capab);
-                mgmt->u.reassoc_req.listen_interval =
-                                cpu_to_le16(local->hw.conf.listen_interval);
-                memcpy(mgmt->u.reassoc_req.current_ap, wk->assoc.prev_bssid,
-                       ETH_ALEN);
-        } else {
-                skb_put(skb, 4);
-                mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                                                  IEEE80211_STYPE_ASSOC_REQ);
-                mgmt->u.assoc_req.capab_info = cpu_to_le16(capab);
-                mgmt->u.assoc_req.listen_interval =
-                                cpu_to_le16(local->hw.conf.listen_interval);
-        }
-        /* SSID */
-        pos = skb_put(skb, 2 + wk->assoc.ssid_len);
-        *pos++ = WLAN_EID_SSID;
-        *pos++ = wk->assoc.ssid_len;
-        memcpy(pos, wk->assoc.ssid, wk->assoc.ssid_len);
-        /* add all rates which were marked to be used above */
-        supp_rates_len = rates_len;
-        if (supp_rates_len > 8)
-                supp_rates_len = 8;
-        pos = skb_put(skb, supp_rates_len + 2);
-        *pos++ = WLAN_EID_SUPP_RATES;
-        *pos++ = supp_rates_len;
-        count = 0;
-        for (i = 0; i < sband->n_bitrates; i++) {
-                if (BIT(i) & rates) {
-                        int rate = sband->bitrates[i].bitrate;
-                        *pos++ = (u8) (rate / 5);
-                        if (++count == 8)
-                                break;
-                }
-        }
-        if (rates_len > count) {
-                pos = skb_put(skb, rates_len - count + 2);
-                *pos++ = WLAN_EID_EXT_SUPP_RATES;
-                *pos++ = rates_len - count;
-                for (i++; i < sband->n_bitrates; i++) {
-                        if (BIT(i) & rates) {
-                                int rate = sband->bitrates[i].bitrate;
-                                *pos++ = (u8) (rate / 5);
-                        }
-                }
-        }
-        if (capab & WLAN_CAPABILITY_SPECTRUM_MGMT) {
-                /* 1. power capabilities */
-                pos = skb_put(skb, 4);
-                *pos++ = WLAN_EID_PWR_CAPABILITY;
-                *pos++ = 2;
-                *pos++ = 0; /* min tx power */
-                *pos++ = wk->chan->max_power; /* max tx power */
-                /* 2. supported channels */
-                /* TODO: get this in reg domain format */
-                pos = skb_put(skb, 2 * sband->n_channels + 2);
-                *pos++ = WLAN_EID_SUPPORTED_CHANNELS;
-                *pos++ = 2 * sband->n_channels;
-                for (i = 0; i < sband->n_channels; i++) {
-                        *pos++ = ieee80211_frequency_to_channel(
-                                        sband->channels[i].center_freq);
-                        *pos++ = 1; /* one channel in the subband*/
-                }
-        }
-        /* if present, add any custom IEs that go before HT */
-        if (wk->ie_len && wk->ie) {
-                static const u8 before_ht[] = {
-                        WLAN_EID_SSID,
-                        WLAN_EID_SUPP_RATES,
-                        WLAN_EID_EXT_SUPP_RATES,
-                        WLAN_EID_PWR_CAPABILITY,
-                        WLAN_EID_SUPPORTED_CHANNELS,
-                        WLAN_EID_RSN,
-                        WLAN_EID_QOS_CAPA,
-                        WLAN_EID_RRM_ENABLED_CAPABILITIES,
-                        WLAN_EID_MOBILITY_DOMAIN,
-                        WLAN_EID_SUPPORTED_REGULATORY_CLASSES,
-                };
-                noffset = ieee80211_ie_split(wk->ie, wk->ie_len,
-                                             before_ht, ARRAY_SIZE(before_ht),
-                                             offset);
-                pos = skb_put(skb, noffset - offset);
-                memcpy(pos, wk->ie + offset, noffset - offset);
-                offset = noffset;
-        }
-        if (wk->assoc.use_11n && wk->assoc.wmm_used &&
-            local->hw.queues >= 4)
-                ieee80211_add_ht_ie(sdata, skb, wk->assoc.ht_information_ie,
-                                    sband, wk->chan, wk->assoc.smps);
-        /* if present, add any custom non-vendor IEs that go after HT */
-        if (wk->ie_len && wk->ie) {
-                noffset = ieee80211_ie_split_vendor(wk->ie, wk->ie_len,
-                                                    offset);
-                pos = skb_put(skb, noffset - offset);
-                memcpy(pos, wk->ie + offset, noffset - offset);
-                offset = noffset;
-        }
-        if (wk->assoc.wmm_used && local->hw.queues >= 4) {
-                if (wk->assoc.uapsd_used) {
-                        qos_info = local->uapsd_queues;
-                        qos_info |= (local->uapsd_max_sp_len <<
-                                     IEEE80211_WMM_IE_STA_QOSINFO_SP_SHIFT);
-                } else {
-                        qos_info = 0;
-                }
-                pos = skb_put(skb, 9);
-                *pos++ = WLAN_EID_VENDOR_SPECIFIC;
-                *pos++ = 7; /* len */
-                *pos++ = 0x00; /* Microsoft OUI 00:50:F2 */
-                *pos++ = 0x50;
-                *pos++ = 0xf2;
-                *pos++ = 2; /* WME */
-                *pos++ = 0; /* WME info */
-                *pos++ = 1; /* WME ver */
-                *pos++ = qos_info;
-        }
-        /* add any remaining custom (i.e. vendor specific here) IEs */
-        if (wk->ie_len && wk->ie) {
-                noffset = wk->ie_len;
-                pos = skb_put(skb, noffset - offset);
-                memcpy(pos, wk->ie + offset, noffset - offset);
-        }
-        IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
-        ieee80211_tx_skb(sdata, skb);
-}
-static void ieee80211_remove_auth_bss(struct ieee80211_local *local,
-                                      struct ieee80211_work *wk)
-{
-        struct cfg80211_bss *cbss;
-        u16 capa_val = WLAN_CAPABILITY_ESS;
-        if (wk->probe_auth.privacy)
-                capa_val |= WLAN_CAPABILITY_PRIVACY;
-        cbss = cfg80211_get_bss(local->hw.wiphy, wk->chan, wk->filter_ta,
-                                wk->probe_auth.ssid, wk->probe_auth.ssid_len,
-                                WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_PRIVACY,
-                                capa_val);
-        if (!cbss)
-                return;
-        cfg80211_unlink_bss(local->hw.wiphy, cbss);
-        cfg80211_put_bss(cbss);
-}
-static enum work_action __must_check
-ieee80211_direct_probe(struct ieee80211_work *wk)
-{
-        struct ieee80211_sub_if_data *sdata = wk->sdata;
-        struct ieee80211_local *local = sdata->local;
-        if (!wk->probe_auth.synced) {
-                int ret = drv_tx_sync(local, sdata, wk->filter_ta,
-                                      IEEE80211_TX_SYNC_AUTH);
-                if (ret)
-                        return WORK_ACT_TIMEOUT;
-        }
-        wk->probe_auth.synced = true;
-        wk->probe_auth.tries++;
-        if (wk->probe_auth.tries > IEEE80211_AUTH_MAX_TRIES) {
-                printk(KERN_DEBUG "%s: direct probe to %pM timed out\n",
-                       sdata->name, wk->filter_ta);
-                /*
-                 * Most likely AP is not in the range so remove the
-                 * bss struct for that AP.
-                 */
-                ieee80211_remove_auth_bss(local, wk);
-                return WORK_ACT_TIMEOUT;
-        }
-        printk(KERN_DEBUG "%s: direct probe to %pM (try %d/%i)\n",
-               sdata->name, wk->filter_ta, wk->probe_auth.tries,
-               IEEE80211_AUTH_MAX_TRIES);
-        /*
-         * Direct probe is sent to broadcast address as some APs
-         * will not answer to direct packet in unassociated state.
-         */
-        ieee80211_send_probe_req(sdata, NULL, wk->probe_auth.ssid,
-                                 wk->probe_auth.ssid_len, NULL, 0,
-                                 (u32) -1, true, false);
-        wk->timeout = jiffies + IEEE80211_AUTH_TIMEOUT;
-        run_again(local, wk->timeout);
-        return WORK_ACT_NONE;
-}
-static enum work_action __must_check
-ieee80211_authenticate(struct ieee80211_work *wk)
-{
-        struct ieee80211_sub_if_data *sdata = wk->sdata;
-        struct ieee80211_local *local = sdata->local;
-        if (!wk->probe_auth.synced) {
-                int ret = drv_tx_sync(local, sdata, wk->filter_ta,
-                                      IEEE80211_TX_SYNC_AUTH);
-                if (ret)
-                        return WORK_ACT_TIMEOUT;
-        }
-        wk->probe_auth.synced = true;
-        wk->probe_auth.tries++;
-        if (wk->probe_auth.tries > IEEE80211_AUTH_MAX_TRIES) {
-                printk(KERN_DEBUG "%s: authentication with %pM"
-                       " timed out\n", sdata->name, wk->filter_ta);
-                /*
-                 * Most likely AP is not in the range so remove the
-                 * bss struct for that AP.
-                 */
-                ieee80211_remove_auth_bss(local, wk);
-                return WORK_ACT_TIMEOUT;
-        }
-        printk(KERN_DEBUG "%s: authenticate with %pM (try %d)\n",
-               sdata->name, wk->filter_ta, wk->probe_auth.tries);
-        ieee80211_send_auth(sdata, 1, wk->probe_auth.algorithm, wk->ie,
-                            wk->ie_len, wk->filter_ta, NULL, 0, 0);
-        wk->probe_auth.transaction = 2;
-        wk->timeout = jiffies + IEEE80211_AUTH_TIMEOUT;
-        run_again(local, wk->timeout);
-        return WORK_ACT_NONE;
-}
-static enum work_action __must_check
-ieee80211_associate(struct ieee80211_work *wk)
-{
-        struct ieee80211_sub_if_data *sdata = wk->sdata;
-        struct ieee80211_local *local = sdata->local;
-        if (!wk->assoc.synced) {
-                int ret = drv_tx_sync(local, sdata, wk->filter_ta,
-                                      IEEE80211_TX_SYNC_ASSOC);
-                if (ret)
-                        return WORK_ACT_TIMEOUT;
-        }
-        wk->assoc.synced = true;
-        wk->assoc.tries++;
-        if (wk->assoc.tries > IEEE80211_ASSOC_MAX_TRIES) {
-                printk(KERN_DEBUG "%s: association with %pM"
-                       " timed out\n",
-                       sdata->name, wk->filter_ta);
-                /*
-                 * Most likely AP is not in the range so remove the
-                 * bss struct for that AP.
-                 */
-                if (wk->assoc.bss)
-                        cfg80211_unlink_bss(local->hw.wiphy, wk->assoc.bss);
-                return WORK_ACT_TIMEOUT;
-        }
-        printk(KERN_DEBUG "%s: associate with %pM (try %d)\n",
-               sdata->name, wk->filter_ta, wk->assoc.tries);
-        ieee80211_send_assoc(sdata, wk);
-        wk->timeout = jiffies + IEEE80211_ASSOC_TIMEOUT;
-        run_again(local, wk->timeout);
-        return WORK_ACT_NONE;
-}
 static enum work_action __must_check
 ieee80211_remain_on_channel_timeout(struct ieee80211_work *wk)
 {
@@ -568,300 +103,6 @@ ieee80211_offchannel_tx(struct ieee80211_work *wk)
        return WORK_ACT_TIMEOUT;
 }
-static enum work_action __must_check
-ieee80211_assoc_beacon_wait(struct ieee80211_work *wk)
-{
-        if (wk->started)
-                return WORK_ACT_TIMEOUT;
-        /*
-         * Wait up to one beacon interval ...
-         * should this be more if we miss one?
-         */
-        printk(KERN_DEBUG "%s: waiting for beacon from %pM\n",
-               wk->sdata->name, wk->filter_ta);
-        wk->timeout = TU_TO_EXP_TIME(wk->assoc.bss->beacon_interval);
-        return WORK_ACT_NONE;
-}
-static void ieee80211_auth_challenge(struct ieee80211_work *wk,
-                                     struct ieee80211_mgmt *mgmt,
-                                     size_t len)
-{
-        struct ieee80211_sub_if_data *sdata = wk->sdata;
-        u8 *pos;
-        struct ieee802_11_elems elems;
-        pos = mgmt->u.auth.variable;
-        ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
-        if (!elems.challenge)
-                return;
-        ieee80211_send_auth(sdata, 3, wk->probe_auth.algorithm,
-                            elems.challenge - 2, elems.challenge_len + 2,
-                            wk->filter_ta, wk->probe_auth.key,
-                            wk->probe_auth.key_len, wk->probe_auth.key_idx);
-        wk->probe_auth.transaction = 4;
-}
-static enum work_action __must_check
-ieee80211_rx_mgmt_auth(struct ieee80211_work *wk,
-                       struct ieee80211_mgmt *mgmt, size_t len)
-{
-        u16 auth_alg, auth_transaction, status_code;
-        if (wk->type != IEEE80211_WORK_AUTH)
-                return WORK_ACT_MISMATCH;
-        if (len < 24 + 6)
-                return WORK_ACT_NONE;
-        auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);
-        auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);
-        status_code = le16_to_cpu(mgmt->u.auth.status_code);
-        if (auth_alg != wk->probe_auth.algorithm ||
-            auth_transaction != wk->probe_auth.transaction)
-                return WORK_ACT_NONE;
-        if (status_code != WLAN_STATUS_SUCCESS) {
-                printk(KERN_DEBUG "%s: %pM denied authentication (status %d)\n",
-                       wk->sdata->name, mgmt->sa, status_code);
-                return WORK_ACT_DONE;
-        }
-        switch (wk->probe_auth.algorithm) {
-        case WLAN_AUTH_OPEN:
-        case WLAN_AUTH_LEAP:
-        case WLAN_AUTH_FT:
-                break;
-        case WLAN_AUTH_SHARED_KEY:
-                if (wk->probe_auth.transaction != 4) {
-                        ieee80211_auth_challenge(wk, mgmt, len);
-                        /* need another frame */
-                        return WORK_ACT_NONE;
-                }
-                break;
-        default:
-                WARN_ON(1);
-                return WORK_ACT_NONE;
-        }
-        printk(KERN_DEBUG "%s: authenticated\n", wk->sdata->name);
-        return WORK_ACT_DONE;
-}
-static enum work_action __must_check
-ieee80211_rx_mgmt_assoc_resp(struct ieee80211_work *wk,
-                             struct ieee80211_mgmt *mgmt, size_t len,
-                             bool reassoc)
-{
-        struct ieee80211_sub_if_data *sdata = wk->sdata;
-        struct ieee80211_local *local = sdata->local;
-        u16 capab_info, status_code, aid;
-        struct ieee802_11_elems elems;
-        u8 *pos;
-        if (wk->type != IEEE80211_WORK_ASSOC)
-                return WORK_ACT_MISMATCH;
-        /*
-         * AssocResp and ReassocResp have identical structure, so process both
-         * of them in this function.
-         */
-        if (len < 24 + 6)
-                return WORK_ACT_NONE;
-        capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info);
-        status_code = le16_to_cpu(mgmt->u.assoc_resp.status_code);
-        aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
-        printk(KERN_DEBUG "%s: RX %sssocResp from %pM (capab=0x%x "
-               "status=%d aid=%d)\n",
-               sdata->name, reassoc ? "Rea" : "A", mgmt->sa,
-               capab_info, status_code, (u16)(aid & ~(BIT(15) | BIT(14))));
-        pos = mgmt->u.assoc_resp.variable;
-        ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
-        if (status_code == WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY &&
-            elems.timeout_int && elems.timeout_int_len == 5 &&
-            elems.timeout_int[0] == WLAN_TIMEOUT_ASSOC_COMEBACK) {
-                u32 tu, ms;
-                tu = get_unaligned_le32(elems.timeout_int + 1);
-                ms = tu * 1024 / 1000;
-                printk(KERN_DEBUG "%s: %pM rejected association temporarily; "
-                       "comeback duration %u TU (%u ms)\n",
-                       sdata->name, mgmt->sa, tu, ms);
-                wk->timeout = jiffies + msecs_to_jiffies(ms);
-                if (ms > IEEE80211_ASSOC_TIMEOUT)
-                        run_again(local, wk->timeout);
-                return WORK_ACT_NONE;
-        }
-        if (status_code != WLAN_STATUS_SUCCESS)
-                printk(KERN_DEBUG "%s: %pM denied association (code=%d)\n",
-                       sdata->name, mgmt->sa, status_code);
-        else
-                printk(KERN_DEBUG "%s: associated\n", sdata->name);
-        return WORK_ACT_DONE;
-}
-static enum work_action __must_check
-ieee80211_rx_mgmt_probe_resp(struct ieee80211_work *wk,
-                             struct ieee80211_mgmt *mgmt, size_t len,
-                             struct ieee80211_rx_status *rx_status)
-{
-        struct ieee80211_sub_if_data *sdata = wk->sdata;
-        struct ieee80211_local *local = sdata->local;
-        size_t baselen;
-        ASSERT_WORK_MTX(local);
-        if (wk->type != IEEE80211_WORK_DIRECT_PROBE)
-                return WORK_ACT_MISMATCH;
-        if (len < 24 + 12)
-                return WORK_ACT_NONE;
-        baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
-        if (baselen > len)
-                return WORK_ACT_NONE;
-        printk(KERN_DEBUG "%s: direct probe responded\n", sdata->name);
-        return WORK_ACT_DONE;
-}
-static enum work_action __must_check
-ieee80211_rx_mgmt_beacon(struct ieee80211_work *wk,
-                         struct ieee80211_mgmt *mgmt, size_t len)
-{
-        struct ieee80211_sub_if_data *sdata = wk->sdata;
-        struct ieee80211_local *local = sdata->local;
-        ASSERT_WORK_MTX(local);
-        if (wk->type != IEEE80211_WORK_ASSOC_BEACON_WAIT)
-                return WORK_ACT_MISMATCH;
-        if (len < 24 + 12)
-                return WORK_ACT_NONE;
-        printk(KERN_DEBUG "%s: beacon received\n", sdata->name);
-        return WORK_ACT_DONE;
-}
-static void ieee80211_work_rx_queued_mgmt(struct ieee80211_local *local,
-                                          struct sk_buff *skb)
-{
-        struct ieee80211_rx_status *rx_status;
-        struct ieee80211_mgmt *mgmt;
-        struct ieee80211_work *wk;
-        enum work_action rma = WORK_ACT_NONE;
-        u16 fc;
-        rx_status = (struct ieee80211_rx_status *) skb->cb;
-        mgmt = (struct ieee80211_mgmt *) skb->data;
-        fc = le16_to_cpu(mgmt->frame_control);
-        mutex_lock(&local->mtx);
-        list_for_each_entry(wk, &local->work_list, list) {
-                const u8 *bssid = NULL;
-                switch (wk->type) {
-                case IEEE80211_WORK_DIRECT_PROBE:
-                case IEEE80211_WORK_AUTH:
-                case IEEE80211_WORK_ASSOC:
-                case IEEE80211_WORK_ASSOC_BEACON_WAIT:
-                        bssid = wk->filter_ta;
-                        break;
-                default:
-                        continue;
-                }
-                /*
-                 * Before queuing, we already verified mgmt->sa,
-                 * so this is needed just for matching.
-                 */
-                if (compare_ether_addr(bssid, mgmt->bssid))
-                        continue;
-                switch (fc & IEEE80211_FCTL_STYPE) {
-                case IEEE80211_STYPE_BEACON:
-                        rma = ieee80211_rx_mgmt_beacon(wk, mgmt, skb->len);
-                        break;
-                case IEEE80211_STYPE_PROBE_RESP:
-                        rma = ieee80211_rx_mgmt_probe_resp(wk, mgmt, skb->len,
-                                                           rx_status);
-                        break;
-                case IEEE80211_STYPE_AUTH:
-                        rma = ieee80211_rx_mgmt_auth(wk, mgmt, skb->len);
-                        break;
-                case IEEE80211_STYPE_ASSOC_RESP:
-                        rma = ieee80211_rx_mgmt_assoc_resp(wk, mgmt,
-                                                           skb->len, false);
-                        break;
-                case IEEE80211_STYPE_REASSOC_RESP:
-                        rma = ieee80211_rx_mgmt_assoc_resp(wk, mgmt,
-                                                           skb->len, true);
-                        break;
-                default:
-                        WARN_ON(1);
-                        rma = WORK_ACT_NONE;
-                }
-                /*
-                 * We've either received an unexpected frame, or we have
-                 * multiple work items and need to match the frame to the
-                 * right one.
-                 */
-                if (rma == WORK_ACT_MISMATCH)
-                        continue;
-                /*
-                 * We've processed this frame for that work, so it can't
-                 * belong to another work struct.
-                 * NB: this is also required for correctness for 'rma'!
-                 */
-                break;
-        }
-        switch (rma) {
-        case WORK_ACT_MISMATCH:
-                /* ignore this unmatched frame */
-                break;
-        case WORK_ACT_NONE:
-                break;
-        case WORK_ACT_DONE:
-                list_del_rcu(&wk->list);
-                break;
-        default:
-                WARN(1, "unexpected: %d", rma);
-        }
-        mutex_unlock(&local->mtx);
-        if (rma != WORK_ACT_DONE)
-                goto out;
-        switch (wk->done(wk, skb)) {
-        case WORK_DONE_DESTROY:
-                free_work(wk);
-                break;
-        case WORK_DONE_REQUEUE:
-                synchronize_rcu();
-                wk->started = false; /* restart */
-                mutex_lock(&local->mtx);
-                list_add_tail(&wk->list, &local->work_list);
-                mutex_unlock(&local->mtx);
-        }
- out:
-        kfree_skb(skb);
-}
 static void ieee80211_work_timer(unsigned long data)
 {
        struct ieee80211_local *local = (void *) data;
@@ -876,7 +117,6 @@ static void ieee80211_work_work(struct work_struct *work)
 {
        struct ieee80211_local *local =
                container_of(work, struct ieee80211_local, work_work);
-        struct sk_buff *skb;
        struct ieee80211_work *wk, *tmp;
        LIST_HEAD(free_work);
        enum work_action rma;
@@ -892,10 +132,6 @@ static void ieee80211_work_work(struct work_struct *work)
        if (WARN(local->suspended, "work scheduled while going to suspend\n"))
                return;
-        /* first process frames to avoid timing out while a frame is pending */
-        while ((skb = skb_dequeue(&local->work_skb_queue)))
-                ieee80211_work_rx_queued_mgmt(local, skb);
        mutex_lock(&local->mtx);
        ieee80211_recalc_idle(local);
@@ -946,24 +182,12 @@ static void ieee80211_work_work(struct work_struct *work)
                case IEEE80211_WORK_ABORT:
                        rma = WORK_ACT_TIMEOUT;
                        break;
-                case IEEE80211_WORK_DIRECT_PROBE:
-                        rma = ieee80211_direct_probe(wk);
-                        break;
-                case IEEE80211_WORK_AUTH:
-                        rma = ieee80211_authenticate(wk);
-                        break;
-                case IEEE80211_WORK_ASSOC:
-                        rma = ieee80211_associate(wk);
-                        break;
                case IEEE80211_WORK_REMAIN_ON_CHANNEL:
                        rma = ieee80211_remain_on_channel_timeout(wk);
                        break;
                case IEEE80211_WORK_OFFCHANNEL_TX:
                        rma = ieee80211_offchannel_tx(wk);
                        break;
-                case IEEE80211_WORK_ASSOC_BEACON_WAIT:
-                        rma = ieee80211_assoc_beacon_wait(wk);
-                        break;
                }
                wk->started = started;
@@ -1051,7 +275,6 @@ void ieee80211_work_init(struct ieee80211_local *local)
        setup_timer(&local->work_timer, ieee80211_work_timer,
                    (unsigned long)local);
        INIT_WORK(&local->work_work, ieee80211_work_work);
-        skb_queue_head_init(&local->work_skb_queue);
 }
 void ieee80211_work_purge(struct ieee80211_sub_if_data *sdata)
@@ -1085,43 +308,6 @@ void ieee80211_work_purge(struct ieee80211_sub_if_data *sdata)
        mutex_unlock(&local->mtx);
 }
-ieee80211_rx_result ieee80211_work_rx_mgmt(struct ieee80211_sub_if_data *sdata,
-                                           struct sk_buff *skb)
-{
-        struct ieee80211_local *local = sdata->local;
-        struct ieee80211_mgmt *mgmt;
-        struct ieee80211_work *wk;
-        u16 fc;
-        if (skb->len < 24)
-                return RX_DROP_MONITOR;
-        mgmt = (struct ieee80211_mgmt *) skb->data;
-        fc = le16_to_cpu(mgmt->frame_control);
-        list_for_each_entry_rcu(wk, &local->work_list, list) {
-                if (sdata != wk->sdata)
-                        continue;
-                if (compare_ether_addr(wk->filter_ta, mgmt->sa))
-                        continue;
-                if (compare_ether_addr(wk->filter_ta, mgmt->bssid))
-                        continue;
-                switch (fc & IEEE80211_FCTL_STYPE) {
-                case IEEE80211_STYPE_AUTH:
-                case IEEE80211_STYPE_PROBE_RESP:
-                case IEEE80211_STYPE_ASSOC_RESP:
-                case IEEE80211_STYPE_REASSOC_RESP:
-                case IEEE80211_STYPE_BEACON:
-                        skb_queue_tail(&local->work_skb_queue, skb);
-                        ieee80211_queue_work(&local->hw, &local->work_work);
-                        return RX_QUEUED;
-                }
-        }
-        return RX_CONTINUE;
-}
 static enum work_done_result ieee80211_remain_done(struct ieee80211_work *wk,
                                                   struct sk_buff *skb)
 {
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index b758350919ff..0ae23c60968c 100644
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -138,6 +138,10 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_rx_data *rx)
        if (skb->len < hdrlen + MICHAEL_MIC_LEN)
                return RX_DROP_UNUSABLE;
+        if (skb_linearize(rx->skb))
+                return RX_DROP_UNUSABLE;
+        hdr = (void *)skb->data;
        data = skb->data + hdrlen;
        data_len = skb->len - hdrlen - MICHAEL_MIC_LEN;
        key = &rx->key->conf.key[NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY];
@@ -253,6 +257,11 @@ ieee80211_crypto_tkip_decrypt(struct ieee80211_rx_data *rx)
        if (!rx->sta || skb->len - hdrlen < 12)
                return RX_DROP_UNUSABLE;
+        /* it may be possible to optimize this a bit more */
+        if (skb_linearize(rx->skb))
+                return RX_DROP_UNUSABLE;
+        hdr = (void *)skb->data;
        /*
         * Let TKIP code verify IV, but skip decryption.
         * In the case where hardware checks the IV as well,
@@ -484,6 +493,14 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx)
        if (!rx->sta || data_len < 0)
                return RX_DROP_UNUSABLE;
+        if (status->flag & RX_FLAG_DECRYPTED) {
+                if (!pskb_may_pull(rx->skb, hdrlen + CCMP_HDR_LEN))
+                        return RX_DROP_UNUSABLE;
+        } else {
+                if (skb_linearize(rx->skb))
+                        return RX_DROP_UNUSABLE;
+        }
        ccmp_hdr2pn(pn, skb->data + hdrlen);
        queue = rx->security_idx;
@@ -509,7 +526,8 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx)
        memcpy(key->u.ccmp.rx_pn[queue], pn, CCMP_PN_LEN);
        /* Remove CCMP header and MIC */
-        skb_trim(skb, skb->len - CCMP_MIC_LEN);
+        if (pskb_trim(skb, skb->len - CCMP_MIC_LEN))
+                return RX_DROP_UNUSABLE;
        memmove(skb->data + CCMP_HDR_LEN, skb->data, hdrlen);
        skb_pull(skb, CCMP_HDR_LEN);
@@ -609,6 +627,8 @@ ieee80211_crypto_aes_cmac_decrypt(struct ieee80211_rx_data *rx)
        if (!ieee80211_is_mgmt(hdr->frame_control))
                return RX_CONTINUE;
+        /* management frames are already linear */
        if (skb->len < 24 + sizeof(*mmie))
                return RX_DROP_UNUSABLE;
author	Linus Torvalds <torvalds@linux-foundation.org>	2012-03-21 00:04:47 -0400
committer	Linus Torvalds <torvalds@linux-foundation.org>	2012-03-21 00:04:47 -0400
commit	3b59bf081622b6446db77ad06c93fe23677bc533 (patch)
tree	3f4bb5a27c90cc86994a1f6d3c53fbf9208003cb /net/mac80211
parent	e45836fafe157df137a837093037f741ad8f4c90 (diff)
parent	bbdb32cb5b73597386913d052165423b9d736145 (diff)