mac80211: move dynamic PS timeout to hardware config
[linux-2.6.git] / net / mac80211 / mlme.c
index f1ee9d2..7709e76 100644 (file)
@@ -14,7 +14,6 @@
 #include <linux/delay.h>
 #include <linux/if_ether.h>
 #include <linux/skbuff.h>
-#include <linux/netdevice.h>
 #include <linux/if_arp.h>
 #include <linux/wireless.h>
 #include <linux/random.h>
 #include <linux/rtnetlink.h>
 #include <net/iw_handler.h>
 #include <net/mac80211.h>
+#include <asm/unaligned.h>
 
 #include "ieee80211_i.h"
 #include "rate.h"
 #include "led.h"
-#include "mesh.h"
 
 #define IEEE80211_ASSOC_SCANS_MAX_TRIES 2
 #define IEEE80211_AUTH_TIMEOUT (HZ / 5)
@@ -34,7 +33,6 @@
 #define IEEE80211_ASSOC_TIMEOUT (HZ / 5)
 #define IEEE80211_ASSOC_MAX_TRIES 3
 #define IEEE80211_MONITORING_INTERVAL (2 * HZ)
-#define IEEE80211_MESH_HOUSEKEEPING_INTERVAL (60 * HZ)
 #define IEEE80211_PROBE_INTERVAL (60 * HZ)
 #define IEEE80211_RETRY_AUTH_INTERVAL (1 * HZ)
 #define IEEE80211_SCAN_INTERVAL (2 * HZ)
@@ -43,7 +41,6 @@
 
 #define IEEE80211_IBSS_MERGE_INTERVAL (30 * HZ)
 #define IEEE80211_IBSS_INACTIVITY_LIMIT (60 * HZ)
-#define IEEE80211_MESH_PEER_INACTIVITY_LIMIT (1800 * HZ)
 
 #define IEEE80211_IBSS_MAX_STA_ENTRIES 128
 
@@ -54,7 +51,7 @@ static int ecw2cw(int ecw)
        return (1 << ecw) - 1;
 }
 
-static u8 *ieee80211_bss_get_ie(struct ieee80211_sta_bss *bss, u8 ie)
+static u8 *ieee80211_bss_get_ie(struct ieee80211_bss *bss, u8 ie)
 {
        u8 *end, *pos;
 
@@ -74,7 +71,7 @@ static u8 *ieee80211_bss_get_ie(struct ieee80211_sta_bss *bss, u8 ie)
        return NULL;
 }
 
-static int ieee80211_compatible_rates(struct ieee80211_sta_bss *bss,
+static int ieee80211_compatible_rates(struct ieee80211_bss *bss,
                                      struct ieee80211_supported_band *sband,
                                      u64 *rates)
 {
@@ -95,58 +92,46 @@ static int ieee80211_compatible_rates(struct ieee80211_sta_bss *bss,
        return count;
 }
 
-/* frame sending functions */
-void ieee80211_sta_tx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,
-                     int encrypt)
-{
-       skb->dev = sdata->local->mdev;
-       skb_set_mac_header(skb, 0);
-       skb_set_network_header(skb, 0);
-       skb_set_transport_header(skb, 0);
-
-       skb->iif = sdata->dev->ifindex;
-       skb->do_not_encrypt = !encrypt;
-
-       dev_queue_xmit(skb);
-}
-
-static void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
-                               struct ieee80211_if_sta *ifsta,
-                               int transaction, u8 *extra, size_t extra_len,
-                               int encrypt)
+/* also used by mesh code */
+u64 ieee80211_sta_get_rates(struct ieee80211_local *local,
+                           struct ieee802_11_elems *elems,
+                           enum ieee80211_band band)
 {
-       struct ieee80211_local *local = sdata->local;
-       struct sk_buff *skb;
-       struct ieee80211_mgmt *mgmt;
+       struct ieee80211_supported_band *sband;
+       struct ieee80211_rate *bitrates;
+       size_t num_rates;
+       u64 supp_rates;
+       int i, j;
+       sband = local->hw.wiphy->bands[band];
 
-       skb = dev_alloc_skb(local->hw.extra_tx_headroom +
-                           sizeof(*mgmt) + 6 + extra_len);
-       if (!skb) {
-               printk(KERN_DEBUG "%s: failed to allocate buffer for auth "
-                      "frame\n", sdata->dev->name);
-               return;
+       if (!sband) {
+               WARN_ON(1);
+               sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
        }
-       skb_reserve(skb, local->hw.extra_tx_headroom);
-
-       mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24 + 6);
-       memset(mgmt, 0, 24 + 6);
-       mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                                         IEEE80211_STYPE_AUTH);
-       if (encrypt)
-               mgmt->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
-       memcpy(mgmt->da, ifsta->bssid, ETH_ALEN);
-       memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);
-       memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN);
-       mgmt->u.auth.auth_alg = cpu_to_le16(ifsta->auth_alg);
-       mgmt->u.auth.auth_transaction = cpu_to_le16(transaction);
-       ifsta->auth_transaction = transaction + 1;
-       mgmt->u.auth.status_code = cpu_to_le16(0);
-       if (extra)
-               memcpy(skb_put(skb, extra_len), extra, extra_len);
 
-       ieee80211_sta_tx(sdata, skb, encrypt);
+       bitrates = sband->bitrates;
+       num_rates = sband->n_bitrates;
+       supp_rates = 0;
+       for (i = 0; i < elems->supp_rates_len +
+                    elems->ext_supp_rates_len; i++) {
+               u8 rate = 0;
+               int own_rate;
+               if (i < elems->supp_rates_len)
+                       rate = elems->supp_rates[i];
+               else if (elems->ext_supp_rates)
+                       rate = elems->ext_supp_rates
+                               [i - elems->supp_rates_len];
+               own_rate = 5 * (rate & 0x7f);
+               for (j = 0; j < num_rates; j++)
+                       if (bitrates[j].bitrate == own_rate)
+                               supp_rates |= BIT(j);
+       }
+       return supp_rates;
 }
 
+/* frame sending functions */
+
+/* also used by scanning code */
 void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst,
                              u8 *ssid, size_t ssid_len)
 {
@@ -204,7 +189,44 @@ void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst,
                *pos = rate->bitrate / 5;
        }
 
-       ieee80211_sta_tx(sdata, skb, 0);
+       ieee80211_tx_skb(sdata, skb, 0);
+}
+
+static void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
+                               struct ieee80211_if_sta *ifsta,
+                               int transaction, u8 *extra, size_t extra_len,
+                               int encrypt)
+{
+       struct ieee80211_local *local = sdata->local;
+       struct sk_buff *skb;
+       struct ieee80211_mgmt *mgmt;
+
+       skb = dev_alloc_skb(local->hw.extra_tx_headroom +
+                           sizeof(*mgmt) + 6 + extra_len);
+       if (!skb) {
+               printk(KERN_DEBUG "%s: failed to allocate buffer for auth "
+                      "frame\n", sdata->dev->name);
+               return;
+       }
+       skb_reserve(skb, local->hw.extra_tx_headroom);
+
+       mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24 + 6);
+       memset(mgmt, 0, 24 + 6);
+       mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
+                                         IEEE80211_STYPE_AUTH);
+       if (encrypt)
+               mgmt->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
+       memcpy(mgmt->da, ifsta->bssid, ETH_ALEN);
+       memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);
+       memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN);
+       mgmt->u.auth.auth_alg = cpu_to_le16(ifsta->auth_alg);
+       mgmt->u.auth.auth_transaction = cpu_to_le16(transaction);
+       ifsta->auth_transaction = transaction + 1;
+       mgmt->u.auth.status_code = cpu_to_le16(0);
+       if (extra)
+               memcpy(skb_put(skb, extra_len), extra, extra_len);
+
+       ieee80211_tx_skb(sdata, skb, encrypt);
 }
 
 static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata,
@@ -213,10 +235,10 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata,
        struct ieee80211_local *local = sdata->local;
        struct sk_buff *skb;
        struct ieee80211_mgmt *mgmt;
-       u8 *pos, *ies, *ht_add_ie;
+       u8 *pos, *ies, *ht_ie;
        int i, len, count, rates_len, supp_rates_len;
        u16 capab;
-       struct ieee80211_sta_bss *bss;
+       struct ieee80211_bss *bss;
        int wmm = 0;
        struct ieee80211_supported_band *sband;
        u64 rates = 0;
@@ -287,7 +309,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata,
                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.reassoc_req.listen_interval =
+               mgmt->u.assoc_req.listen_interval =
                                cpu_to_le16(local->hw.conf.listen_interval);
        }
 
@@ -369,25 +391,33 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata,
        }
 
        /* wmm support is a must to HT */
+       /*
+        * 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.
+        */
        if (wmm && (ifsta->flags & IEEE80211_STA_WMM_ENABLED) &&
-           sband->ht_info.ht_supported &&
-           (ht_add_ie = ieee80211_bss_get_ie(bss, WLAN_EID_HT_EXTRA_INFO))) {
-               struct ieee80211_ht_addt_info *ht_add_info =
-                       (struct ieee80211_ht_addt_info *)ht_add_ie;
-               u16 cap = sband->ht_info.cap;
+           sband->ht_cap.ht_supported &&
+           (ht_ie = ieee80211_bss_get_ie(bss, WLAN_EID_HT_INFORMATION)) &&
+           ht_ie[1] >= sizeof(struct ieee80211_ht_info) &&
+           (!(ifsta->flags & IEEE80211_STA_TKIP_WEP_USED))) {
+               struct ieee80211_ht_info *ht_info =
+                       (struct ieee80211_ht_info *)(ht_ie + 2);
+               u16 cap = sband->ht_cap.cap;
                __le16 tmp;
                u32 flags = local->hw.conf.channel->flags;
 
-               switch (ht_add_info->ht_param & IEEE80211_HT_IE_CHA_SEC_OFFSET) {
-               case IEEE80211_HT_IE_CHA_SEC_ABOVE:
+               switch (ht_info->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
+               case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
                        if (flags & IEEE80211_CHAN_NO_FAT_ABOVE) {
-                               cap &= ~IEEE80211_HT_CAP_SUP_WIDTH;
+                               cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
                                cap &= ~IEEE80211_HT_CAP_SGI_40;
                        }
                        break;
-               case IEEE80211_HT_IE_CHA_SEC_BELOW:
+               case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
                        if (flags & IEEE80211_CHAN_NO_FAT_BELOW) {
-                               cap &= ~IEEE80211_HT_CAP_SUP_WIDTH;
+                               cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
                                cap &= ~IEEE80211_HT_CAP_SGI_40;
                        }
                        break;
@@ -401,9 +431,9 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata,
                memcpy(pos, &tmp, sizeof(u16));
                pos += sizeof(u16);
                /* TODO: needs a define here for << 2 */
-               *pos++ = sband->ht_info.ampdu_factor |
-                        (sband->ht_info.ampdu_density << 2);
-               memcpy(pos, sband->ht_info.supp_mcs_set, 16);
+               *pos++ = sband->ht_cap.ampdu_factor |
+                        (sband->ht_cap.ampdu_density << 2);
+               memcpy(pos, &sband->ht_cap.mcs, sizeof(sband->ht_cap.mcs));
        }
 
        kfree(ifsta->assocreq_ies);
@@ -412,7 +442,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata,
        if (ifsta->assocreq_ies)
                memcpy(ifsta->assocreq_ies, ies, ifsta->assocreq_ies_len);
 
-       ieee80211_sta_tx(sdata, skb, 0);
+       ieee80211_tx_skb(sdata, skb, 0);
 }
 
 
@@ -442,12 +472,12 @@ static void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata,
        /* u.deauth.reason_code == u.disassoc.reason_code */
        mgmt->u.deauth.reason_code = cpu_to_le16(reason);
 
-       ieee80211_sta_tx(sdata, skb, 0);
+       ieee80211_tx_skb(sdata, skb, 0);
 }
 
 /* MLME */
 static void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata,
-                                        struct ieee80211_sta_bss *bss)
+                                        struct ieee80211_bss *bss)
 {
        struct ieee80211_local *local = sdata->local;
        int i, have_higher_than_11mbit = 0;
@@ -545,25 +575,59 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
        }
 }
 
-static u32 ieee80211_handle_protect_preamb(struct ieee80211_sub_if_data *sdata,
-                                          bool use_protection,
-                                          bool use_short_preamble)
+static bool check_tim(struct ieee802_11_elems *elems, u16 aid, bool *is_mc)
 {
-       struct ieee80211_bss_conf *bss_conf = &sdata->bss_conf;
+       u8 mask;
+       u8 index, indexn1, indexn2;
+       struct ieee80211_tim_ie *tim = (struct ieee80211_tim_ie *) elems->tim;
+
+       aid &= 0x3fff;
+       index = aid / 8;
+       mask  = 1 << (aid & 7);
+
+       if (tim->bitmap_ctrl & 0x01)
+               *is_mc = true;
+
+       indexn1 = tim->bitmap_ctrl & 0xfe;
+       indexn2 = elems->tim_len + indexn1 - 4;
+
+       if (index < indexn1 || index > indexn2)
+               return false;
+
+       index -= indexn1;
+
+       return !!(tim->virtual_map[index] & mask);
+}
+
+static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata,
+                                          u16 capab, bool erp_valid, u8 erp)
+{
+       struct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf;
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
        struct ieee80211_if_sta *ifsta = &sdata->u.sta;
-       DECLARE_MAC_BUF(mac);
 #endif
        u32 changed = 0;
+       bool use_protection;
+       bool use_short_preamble;
+       bool use_short_slot;
+
+       if (erp_valid) {
+               use_protection = (erp & WLAN_ERP_USE_PROTECTION) != 0;
+               use_short_preamble = (erp & WLAN_ERP_BARKER_PREAMBLE) == 0;
+       } else {
+               use_protection = false;
+               use_short_preamble = !!(capab & WLAN_CAPABILITY_SHORT_PREAMBLE);
+       }
+
+       use_short_slot = !!(capab & WLAN_CAPABILITY_SHORT_SLOT_TIME);
 
        if (use_protection != bss_conf->use_cts_prot) {
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
                if (net_ratelimit()) {
-                       printk(KERN_DEBUG "%s: CTS protection %s (BSSID="
-                              "%s)\n",
+                       printk(KERN_DEBUG "%s: CTS protection %s (BSSID=%pM)\n",
                               sdata->dev->name,
                               use_protection ? "enabled" : "disabled",
-                              print_mac(mac, ifsta->bssid));
+                              ifsta->bssid);
                }
 #endif
                bss_conf->use_cts_prot = use_protection;
@@ -574,40 +638,28 @@ static u32 ieee80211_handle_protect_preamb(struct ieee80211_sub_if_data *sdata,
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
                if (net_ratelimit()) {
                        printk(KERN_DEBUG "%s: switched to %s barker preamble"
-                              " (BSSID=%s)\n",
+                              " (BSSID=%pM)\n",
                               sdata->dev->name,
                               use_short_preamble ? "short" : "long",
-                              print_mac(mac, ifsta->bssid));
+                              ifsta->bssid);
                }
 #endif
                bss_conf->use_short_preamble = use_short_preamble;
                changed |= BSS_CHANGED_ERP_PREAMBLE;
        }
 
-       return changed;
-}
-
-static u32 ieee80211_handle_erp_ie(struct ieee80211_sub_if_data *sdata,
-                                  u8 erp_value)
-{
-       bool use_protection = (erp_value & WLAN_ERP_USE_PROTECTION) != 0;
-       bool use_short_preamble = (erp_value & WLAN_ERP_BARKER_PREAMBLE) == 0;
-
-       return ieee80211_handle_protect_preamb(sdata,
-                       use_protection, use_short_preamble);
-}
-
-static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata,
-                                          struct ieee80211_sta_bss *bss)
-{
-       u32 changed = 0;
-
-       if (bss->has_erp_value)
-               changed |= ieee80211_handle_erp_ie(sdata, bss->erp_value);
-       else {
-               u16 capab = bss->capability;
-               changed |= ieee80211_handle_protect_preamb(sdata, false,
-                               (capab & WLAN_CAPABILITY_SHORT_PREAMBLE) != 0);
+       if (use_short_slot != bss_conf->use_short_slot) {
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+               if (net_ratelimit()) {
+                       printk(KERN_DEBUG "%s: switched to %s slot time"
+                              " (BSSID=%pM)\n",
+                              sdata->dev->name,
+                              use_short_slot ? "short" : "long",
+                              ifsta->bssid);
+               }
+#endif
+               bss_conf->use_short_slot = use_short_slot;
+               changed |= BSS_CHANGED_ERP_SLOT;
        }
 
        return changed;
@@ -627,35 +679,69 @@ static void ieee80211_sta_send_apinfo(struct ieee80211_sub_if_data *sdata,
 static void ieee80211_sta_send_associnfo(struct ieee80211_sub_if_data *sdata,
                                         struct ieee80211_if_sta *ifsta)
 {
+       char *buf;
+       size_t len;
+       int i;
        union iwreq_data wrqu;
 
+       if (!ifsta->assocreq_ies && !ifsta->assocresp_ies)
+               return;
+
+       buf = kmalloc(50 + 2 * (ifsta->assocreq_ies_len +
+                               ifsta->assocresp_ies_len), GFP_KERNEL);
+       if (!buf)
+               return;
+
+       len = sprintf(buf, "ASSOCINFO(");
        if (ifsta->assocreq_ies) {
-               memset(&wrqu, 0, sizeof(wrqu));
-               wrqu.data.length = ifsta->assocreq_ies_len;
-               wireless_send_event(sdata->dev, IWEVASSOCREQIE, &wrqu,
-                                   ifsta->assocreq_ies);
+               len += sprintf(buf + len, "ReqIEs=");
+               for (i = 0; i < ifsta->assocreq_ies_len; i++) {
+                       len += sprintf(buf + len, "%02x",
+                                      ifsta->assocreq_ies[i]);
+               }
        }
        if (ifsta->assocresp_ies) {
+               if (ifsta->assocreq_ies)
+                       len += sprintf(buf + len, " ");
+               len += sprintf(buf + len, "RespIEs=");
+               for (i = 0; i < ifsta->assocresp_ies_len; i++) {
+                       len += sprintf(buf + len, "%02x",
+                                      ifsta->assocresp_ies[i]);
+               }
+       }
+       len += sprintf(buf + len, ")");
+
+       if (len > IW_CUSTOM_MAX) {
+               len = sprintf(buf, "ASSOCRESPIE=");
+               for (i = 0; i < ifsta->assocresp_ies_len; i++) {
+                       len += sprintf(buf + len, "%02x",
+                                      ifsta->assocresp_ies[i]);
+               }
+       }
+
+       if (len <= IW_CUSTOM_MAX) {
                memset(&wrqu, 0, sizeof(wrqu));
-               wrqu.data.length = ifsta->assocresp_ies_len;
-               wireless_send_event(sdata->dev, IWEVASSOCRESPIE, &wrqu,
-                                   ifsta->assocresp_ies);
+               wrqu.data.length = len;
+               wireless_send_event(sdata->dev, IWEVCUSTOM, &wrqu, buf);
        }
+
+       kfree(buf);
 }
 
 
 static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
-                                    struct ieee80211_if_sta *ifsta)
+                                    struct ieee80211_if_sta *ifsta,
+                                    u32 bss_info_changed)
 {
        struct ieee80211_local *local = sdata->local;
        struct ieee80211_conf *conf = &local_to_hw(local)->conf;
-       u32 changed = BSS_CHANGED_ASSOC;
 
-       struct ieee80211_sta_bss *bss;
+       struct ieee80211_bss *bss;
 
+       bss_info_changed |= BSS_CHANGED_ASSOC;
        ifsta->flags |= IEEE80211_STA_ASSOCIATED;
 
-       if (sdata->vif.type != IEEE80211_IF_TYPE_STA)
+       if (sdata->vif.type != NL80211_IFTYPE_STATION)
                return;
 
        bss = ieee80211_rx_bss_get(local, ifsta->bssid,
@@ -663,22 +749,16 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
                                   ifsta->ssid, ifsta->ssid_len);
        if (bss) {
                /* set timing information */
-               sdata->bss_conf.beacon_int = bss->beacon_int;
-               sdata->bss_conf.timestamp = bss->timestamp;
-               sdata->bss_conf.dtim_period = bss->dtim_period;
+               sdata->vif.bss_conf.beacon_int = bss->beacon_int;
+               sdata->vif.bss_conf.timestamp = bss->timestamp;
+               sdata->vif.bss_conf.dtim_period = bss->dtim_period;
 
-               changed |= ieee80211_handle_bss_capability(sdata, bss);
+               bss_info_changed |= ieee80211_handle_bss_capability(sdata,
+                       bss->capability, bss->has_erp_value, bss->erp_value);
 
                ieee80211_rx_bss_put(local, bss);
        }
 
-       if (conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE) {
-               changed |= BSS_CHANGED_HT;
-               sdata->bss_conf.assoc_ht = 1;
-               sdata->bss_conf.ht_conf = &conf->ht_conf;
-               sdata->bss_conf.ht_bss_conf = &conf->ht_bss_conf;
-       }
-
        ifsta->flags |= IEEE80211_STA_PREV_BSSID_SET;
        memcpy(ifsta->prev_bssid, sdata->u.sta.bssid, ETH_ALEN);
        ieee80211_sta_send_associnfo(sdata, ifsta);
@@ -686,8 +766,28 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
        ifsta->last_probe = jiffies;
        ieee80211_led_assoc(local, 1);
 
-       sdata->bss_conf.assoc = 1;
-       ieee80211_bss_info_change_notify(sdata, changed);
+       sdata->vif.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;
+       ieee80211_bss_info_change_notify(sdata, bss_info_changed);
+
+       if (local->powersave &&
+                       !(local->hw.flags & IEEE80211_HW_NO_STACK_DYNAMIC_PS)) {
+               if (local->hw.conf.dynamic_ps_timeout > 0)
+                       mod_timer(&local->dynamic_ps_timer, jiffies +
+                                 msecs_to_jiffies(
+                                       local->hw.conf.dynamic_ps_timeout));
+               else {
+                       ieee80211_send_nullfunc(local, sdata, 1);
+                       conf->flags |= IEEE80211_CONF_PS;
+                       ieee80211_hw_config(local,
+                                           IEEE80211_CONF_CHANGE_PS);
+               }
+       }
 
        netif_tx_start_all_queues(sdata->dev);
        netif_carrier_on(sdata->dev);
@@ -698,18 +798,17 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
 static void ieee80211_direct_probe(struct ieee80211_sub_if_data *sdata,
                                   struct ieee80211_if_sta *ifsta)
 {
-       DECLARE_MAC_BUF(mac);
-
        ifsta->direct_probe_tries++;
        if (ifsta->direct_probe_tries > IEEE80211_AUTH_MAX_TRIES) {
-               printk(KERN_DEBUG "%s: direct probe to AP %s timed out\n",
-                      sdata->dev->name, print_mac(mac, ifsta->bssid));
+               printk(KERN_DEBUG "%s: direct probe to AP %pM timed out\n",
+                      sdata->dev->name, ifsta->bssid);
                ifsta->state = IEEE80211_STA_MLME_DISABLED;
+               ieee80211_sta_send_apinfo(sdata, ifsta);
                return;
        }
 
-       printk(KERN_DEBUG "%s: direct probe to AP %s try %d\n",
-                       sdata->dev->name, print_mac(mac, ifsta->bssid),
+       printk(KERN_DEBUG "%s: direct probe to AP %pM try %d\n",
+                       sdata->dev->name, ifsta->bssid,
                        ifsta->direct_probe_tries);
 
        ifsta->state = IEEE80211_STA_MLME_DIRECT_PROBE;
@@ -729,33 +828,36 @@ static void ieee80211_direct_probe(struct ieee80211_sub_if_data *sdata,
 static void ieee80211_authenticate(struct ieee80211_sub_if_data *sdata,
                                   struct ieee80211_if_sta *ifsta)
 {
-       DECLARE_MAC_BUF(mac);
-
        ifsta->auth_tries++;
        if (ifsta->auth_tries > IEEE80211_AUTH_MAX_TRIES) {
-               printk(KERN_DEBUG "%s: authentication with AP %s"
+               printk(KERN_DEBUG "%s: authentication with AP %pM"
                       " timed out\n",
-                      sdata->dev->name, print_mac(mac, ifsta->bssid));
+                      sdata->dev->name, ifsta->bssid);
                ifsta->state = IEEE80211_STA_MLME_DISABLED;
+               ieee80211_sta_send_apinfo(sdata, ifsta);
                return;
        }
 
        ifsta->state = IEEE80211_STA_MLME_AUTHENTICATE;
-       printk(KERN_DEBUG "%s: authenticate with AP %s\n",
-              sdata->dev->name, print_mac(mac, ifsta->bssid));
+       printk(KERN_DEBUG "%s: authenticate with AP %pM\n",
+              sdata->dev->name, ifsta->bssid);
 
        ieee80211_send_auth(sdata, ifsta, 1, NULL, 0, 0);
 
        mod_timer(&ifsta->timer, jiffies + IEEE80211_AUTH_TIMEOUT);
 }
 
+/*
+ * The disassoc 'reason' argument can be either our own reason
+ * if self disconnected or a reason code from the AP.
+ */
 static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
                                   struct ieee80211_if_sta *ifsta, bool deauth,
                                   bool self_disconnected, u16 reason)
 {
        struct ieee80211_local *local = sdata->local;
        struct sta_info *sta;
-       u32 changed = BSS_CHANGED_ASSOC;
+       u32 changed = 0, config_changed = 0;
 
        rcu_read_lock();
 
@@ -775,7 +877,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
        netif_tx_stop_all_queues(sdata->dev);
        netif_carrier_off(sdata->dev);
 
-       ieee80211_sta_tear_down_BA_sessions(sdata, sta->addr);
+       ieee80211_sta_tear_down_BA_sessions(sdata, sta->sta.addr);
 
        if (self_disconnected) {
                if (deauth)
@@ -789,21 +891,39 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
        ifsta->flags &= ~IEEE80211_STA_ASSOCIATED;
        changed |= ieee80211_reset_erp_info(sdata);
 
-       if (sdata->bss_conf.assoc_ht)
-               changed |= BSS_CHANGED_HT;
-
-       sdata->bss_conf.assoc_ht = 0;
-       sdata->bss_conf.ht_conf = NULL;
-       sdata->bss_conf.ht_bss_conf = NULL;
-
        ieee80211_led_assoc(local, 0);
-       sdata->bss_conf.assoc = 0;
+       changed |= BSS_CHANGED_ASSOC;
+       sdata->vif.bss_conf.assoc = false;
 
        ieee80211_sta_send_apinfo(sdata, ifsta);
 
-       if (self_disconnected)
+       if (self_disconnected || reason == WLAN_REASON_DISASSOC_STA_HAS_LEFT)
                ifsta->state = IEEE80211_STA_MLME_DISABLED;
 
+       rcu_read_unlock();
+
+       /* channel(_type) changes are handled by ieee80211_hw_config */
+       local->oper_channel_type = NL80211_CHAN_NO_HT;
+
+       del_timer_sync(&local->dynamic_ps_timer);
+       cancel_work_sync(&local->dynamic_ps_enable_work);
+
+       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, config_changed);
+       ieee80211_bss_info_change_notify(sdata, changed);
+
+       rcu_read_lock();
+
+       sta = sta_info_get(local, ifsta->bssid);
+       if (!sta) {
+               rcu_read_unlock();
+               return;
+       }
+
        sta_info_unlink(&sta);
 
        rcu_read_unlock();
@@ -823,7 +943,7 @@ static int ieee80211_privacy_mismatch(struct ieee80211_sub_if_data *sdata,
                                      struct ieee80211_if_sta *ifsta)
 {
        struct ieee80211_local *local = sdata->local;
-       struct ieee80211_sta_bss *bss;
+       struct ieee80211_bss *bss;
        int bss_privacy;
        int wep_privacy;
        int privacy_invoked;
@@ -852,20 +972,19 @@ static int ieee80211_privacy_mismatch(struct ieee80211_sub_if_data *sdata,
 static void ieee80211_associate(struct ieee80211_sub_if_data *sdata,
                                struct ieee80211_if_sta *ifsta)
 {
-       DECLARE_MAC_BUF(mac);
-
        ifsta->assoc_tries++;
        if (ifsta->assoc_tries > IEEE80211_ASSOC_MAX_TRIES) {
-               printk(KERN_DEBUG "%s: association with AP %s"
+               printk(KERN_DEBUG "%s: association with AP %pM"
                       " timed out\n",
-                      sdata->dev->name, print_mac(mac, ifsta->bssid));
+                      sdata->dev->name, ifsta->bssid);
                ifsta->state = IEEE80211_STA_MLME_DISABLED;
+               ieee80211_sta_send_apinfo(sdata, ifsta);
                return;
        }
 
        ifsta->state = IEEE80211_STA_MLME_ASSOCIATE;
-       printk(KERN_DEBUG "%s: associate with AP %s\n",
-              sdata->dev->name, print_mac(mac, ifsta->bssid));
+       printk(KERN_DEBUG "%s: associate with AP %pM\n",
+              sdata->dev->name, ifsta->bssid);
        if (ieee80211_privacy_mismatch(sdata, ifsta)) {
                printk(KERN_DEBUG "%s: mismatch in privacy configuration and "
                       "mixed-cell disabled - abort association\n", sdata->dev->name);
@@ -885,7 +1004,6 @@ static void ieee80211_associated(struct ieee80211_sub_if_data *sdata,
        struct ieee80211_local *local = sdata->local;
        struct sta_info *sta;
        int disassoc;
-       DECLARE_MAC_BUF(mac);
 
        /* TODO: start monitoring current AP signal quality and number of
         * missed beacons. Scan other channels every now and then and search
@@ -898,8 +1016,8 @@ static void ieee80211_associated(struct ieee80211_sub_if_data *sdata,
 
        sta = sta_info_get(local, ifsta->bssid);
        if (!sta) {
-               printk(KERN_DEBUG "%s: No STA entry for own AP %s\n",
-                      sdata->dev->name, print_mac(mac, ifsta->bssid));
+               printk(KERN_DEBUG "%s: No STA entry for own AP %pM\n",
+                      sdata->dev->name, ifsta->bssid);
                disassoc = 1;
        } else {
                disassoc = 0;
@@ -907,14 +1025,14 @@ static void ieee80211_associated(struct ieee80211_sub_if_data *sdata,
                               sta->last_rx + IEEE80211_MONITORING_INTERVAL)) {
                        if (ifsta->flags & IEEE80211_STA_PROBEREQ_POLL) {
                                printk(KERN_DEBUG "%s: No ProbeResp from "
-                                      "current AP %s - assume out of "
+                                      "current AP %pM - assume out of "
                                       "range\n",
-                                      sdata->dev->name, print_mac(mac, ifsta->bssid));
+                                      sdata->dev->name, ifsta->bssid);
                                disassoc = 1;
                        } else
                                ieee80211_send_probe_req(sdata, ifsta->bssid,
-                                                        local->scan_ssid,
-                                                        local->scan_ssid_len);
+                                                        ifsta->ssid,
+                                                        ifsta->ssid_len);
                        ifsta->flags ^= IEEE80211_STA_PROBEREQ_POLL;
                } else {
                        ifsta->flags &= ~IEEE80211_STA_PROBEREQ_POLL;
@@ -970,20 +1088,19 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
                                   size_t len)
 {
        u16 auth_alg, auth_transaction, status_code;
-       DECLARE_MAC_BUF(mac);
 
        if (ifsta->state != IEEE80211_STA_MLME_AUTHENTICATE &&
-           sdata->vif.type != IEEE80211_IF_TYPE_IBSS)
+           sdata->vif.type != NL80211_IFTYPE_ADHOC)
                return;
 
        if (len < 24 + 6)
                return;
 
-       if (sdata->vif.type != IEEE80211_IF_TYPE_IBSS &&
+       if (sdata->vif.type != NL80211_IFTYPE_ADHOC &&
            memcmp(ifsta->bssid, mgmt->sa, ETH_ALEN) != 0)
                return;
 
-       if (sdata->vif.type != IEEE80211_IF_TYPE_IBSS &&
+       if (sdata->vif.type != NL80211_IFTYPE_ADHOC &&
            memcmp(ifsta->bssid, mgmt->bssid, ETH_ALEN) != 0)
                return;
 
@@ -991,7 +1108,7 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
        auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);
        status_code = le16_to_cpu(mgmt->u.auth.status_code);
 
-       if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS) {
+       if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
                /*
                 * IEEE 802.11 standard does not require authentication in IBSS
                 * networks and most implementations do not seem to use it.
@@ -1063,7 +1180,6 @@ static void ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
                                     size_t len)
 {
        u16 reason_code;
-       DECLARE_MAC_BUF(mac);
 
        if (len < 24 + 2)
                return;
@@ -1074,7 +1190,8 @@ static void ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
        reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
 
        if (ifsta->flags & IEEE80211_STA_AUTHENTICATED)
-               printk(KERN_DEBUG "%s: deauthenticated\n", sdata->dev->name);
+               printk(KERN_DEBUG "%s: deauthenticated (Reason: %u)\n",
+                               sdata->dev->name, reason_code);
 
        if (ifsta->state == IEEE80211_STA_MLME_AUTHENTICATE ||
            ifsta->state == IEEE80211_STA_MLME_ASSOCIATE ||
@@ -1095,7 +1212,6 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
                                       size_t len)
 {
        u16 reason_code;
-       DECLARE_MAC_BUF(mac);
 
        if (len < 24 + 2)
                return;
@@ -1106,7 +1222,8 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
        reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
 
        if (ifsta->flags & IEEE80211_STA_ASSOCIATED)
-               printk(KERN_DEBUG "%s: disassociated\n", sdata->dev->name);
+               printk(KERN_DEBUG "%s: disassociated (Reason: %u)\n",
+                               sdata->dev->name, reason_code);
 
        if (ifsta->state == IEEE80211_STA_MLME_ASSOCIATED) {
                ifsta->state = IEEE80211_STA_MLME_ASSOCIATE;
@@ -1114,7 +1231,7 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
                                      IEEE80211_RETRY_AUTH_INTERVAL);
        }
 
-       ieee80211_set_disassoc(sdata, ifsta, false, false, 0);
+       ieee80211_set_disassoc(sdata, ifsta, false, false, reason_code);
 }
 
 
@@ -1130,11 +1247,12 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
        u64 rates, basic_rates;
        u16 capab_info, status_code, aid;
        struct ieee802_11_elems elems;
-       struct ieee80211_bss_conf *bss_conf = &sdata->bss_conf;
+       struct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf;
        u8 *pos;
+       u32 changed = 0;
        int i, j;
-       DECLARE_MAC_BUF(mac);
-       bool have_higher_than_11mbit = false;
+       bool have_higher_than_11mbit = false, newsta = false;
+       u16 ap_ht_cap_flags;
 
        /* AssocResp and ReassocResp have identical structure, so process both
         * of them in this function. */
@@ -1152,9 +1270,9 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
        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 %s (capab=0x%x "
+       printk(KERN_DEBUG "%s: RX %sssocResp from %pM (capab=0x%x "
               "status=%d aid=%d)\n",
-              sdata->dev->name, reassoc ? "Rea" : "A", print_mac(mac, mgmt->sa),
+              sdata->dev->name, reassoc ? "Rea" : "A", mgmt->sa,
               capab_info, status_code, (u16)(aid & ~(BIT(15) | BIT(14))));
 
        if (status_code != WLAN_STATUS_SUCCESS) {
@@ -1196,8 +1314,9 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
        /* Add STA entry for the AP */
        sta = sta_info_get(local, ifsta->bssid);
        if (!sta) {
-               struct ieee80211_sta_bss *bss;
-               int err;
+               struct ieee80211_bss *bss;
+
+               newsta = true;
 
                sta = sta_info_alloc(sdata, ifsta->bssid, GFP_ATOMIC);
                if (!sta) {
@@ -1216,13 +1335,6 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
                        ieee80211_rx_bss_put(local, bss);
                }
 
-               err = sta_info_insert(sta);
-               if (err) {
-                       printk(KERN_DEBUG "%s: failed to insert STA entry for"
-                              " the AP (error %d)\n", sdata->dev->name, err);
-                       rcu_read_unlock();
-                       return;
-               }
                /* update new sta with its last rx activity */
                sta->last_rx = jiffies;
        }
@@ -1246,34 +1358,40 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
 
        for (i = 0; i < elems.supp_rates_len; i++) {
                int rate = (elems.supp_rates[i] & 0x7f) * 5;
+               bool is_basic = !!(elems.supp_rates[i] & 0x80);
 
                if (rate > 110)
                        have_higher_than_11mbit = true;
 
                for (j = 0; j < sband->n_bitrates; j++) {
-                       if (sband->bitrates[j].bitrate == rate)
+                       if (sband->bitrates[j].bitrate == rate) {
                                rates |= BIT(j);
-                       if (elems.supp_rates[i] & 0x80)
-                               basic_rates |= BIT(j);
+                               if (is_basic)
+                                       basic_rates |= BIT(j);
+                               break;
+                       }
                }
        }
 
        for (i = 0; i < elems.ext_supp_rates_len; i++) {
                int rate = (elems.ext_supp_rates[i] & 0x7f) * 5;
+               bool is_basic = !!(elems.supp_rates[i] & 0x80);
 
                if (rate > 110)
                        have_higher_than_11mbit = true;
 
                for (j = 0; j < sband->n_bitrates; j++) {
-                       if (sband->bitrates[j].bitrate == rate)
+                       if (sband->bitrates[j].bitrate == rate) {
                                rates |= BIT(j);
-                       if (elems.ext_supp_rates[i] & 0x80)
-                               basic_rates |= BIT(j);
+                               if (is_basic)
+                                       basic_rates |= BIT(j);
+                               break;
+                       }
                }
        }
 
-       sta->supp_rates[local->hw.conf.channel->band] = rates;
-       sdata->basic_rates = basic_rates;
+       sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
+       sdata->vif.bss_conf.basic_rates = basic_rates;
 
        /* cf. IEEE 802.11 9.2.12 */
        if (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ &&
@@ -1282,33 +1400,43 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
        else
                sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE;
 
-       if (elems.ht_cap_elem && elems.ht_info_elem && elems.wmm_param &&
-           (ifsta->flags & IEEE80211_STA_WMM_ENABLED)) {
-               struct ieee80211_ht_bss_info bss_info;
-               ieee80211_ht_cap_ie_to_ht_info(
-                               (struct ieee80211_ht_cap *)
-                               elems.ht_cap_elem, &sta->ht_info);
-               ieee80211_ht_addt_info_ie_to_ht_bss_info(
-                               (struct ieee80211_ht_addt_info *)
-                               elems.ht_info_elem, &bss_info);
-               ieee80211_handle_ht(local, 1, &sta->ht_info, &bss_info);
-       }
+       if (elems.ht_cap_elem)
+               ieee80211_ht_cap_ie_to_sta_ht_cap(sband,
+                               elems.ht_cap_elem, &sta->sta.ht_cap);
+
+       ap_ht_cap_flags = sta->sta.ht_cap.cap;
 
-       rate_control_rate_init(sta, local);
+       rate_control_rate_init(sta);
 
-       if (elems.wmm_param) {
+       if (elems.wmm_param)
                set_sta_flags(sta, WLAN_STA_WME);
-               rcu_read_unlock();
+
+       if (newsta) {
+               int err = sta_info_insert(sta);
+               if (err) {
+                       printk(KERN_DEBUG "%s: failed to insert STA entry for"
+                              " the AP (error %d)\n", sdata->dev->name, err);
+                       rcu_read_unlock();
+                       return;
+               }
+       }
+
+       rcu_read_unlock();
+
+       if (elems.wmm_param)
                ieee80211_sta_wmm_params(local, ifsta, elems.wmm_param,
                                         elems.wmm_param_len);
-       } else
-               rcu_read_unlock();
+
+       if (elems.ht_info_elem && elems.wmm_param &&
+           (ifsta->flags & IEEE80211_STA_WMM_ENABLED))
+               changed |= ieee80211_enable_ht(sdata, elems.ht_info_elem,
+                                              ap_ht_cap_flags);
 
        /* set AID and assoc capability,
         * ieee80211_set_associated() will tell the driver */
        bss_conf->aid = aid;
        bss_conf->assoc_capability = capab_info;
-       ieee80211_set_associated(sdata, ifsta);
+       ieee80211_set_associated(sdata, ifsta, changed);
 
        ieee80211_associated(sdata, ifsta);
 }
@@ -1316,7 +1444,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
 
 static int ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                                   struct ieee80211_if_sta *ifsta,
-                                  struct ieee80211_sta_bss *bss)
+                                  struct ieee80211_bss *bss)
 {
        struct ieee80211_local *local = sdata->local;
        int res, rates, i, j;
@@ -1326,6 +1454,13 @@ static int ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
        struct ieee80211_supported_band *sband;
        union iwreq_data wrqu;
 
+       skb = dev_alloc_skb(local->hw.extra_tx_headroom + 400);
+       if (!skb) {
+               printk(KERN_DEBUG "%s: failed to allocate buffer for probe "
+                      "response\n", sdata->dev->name);
+               return -ENOMEM;
+       }
+
        sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
 
        /* Remove possible STA entries from other IBSS networks. */
@@ -1351,63 +1486,62 @@ static int ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                return res;
 
        /* Build IBSS probe response */
-       skb = dev_alloc_skb(local->hw.extra_tx_headroom + 400);
-       if (skb) {
-               skb_reserve(skb, local->hw.extra_tx_headroom);
 
-               mgmt = (struct ieee80211_mgmt *)
-                       skb_put(skb, 24 + sizeof(mgmt->u.beacon));
-               memset(mgmt, 0, 24 + sizeof(mgmt->u.beacon));
-               mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                                                 IEEE80211_STYPE_PROBE_RESP);
-               memset(mgmt->da, 0xff, ETH_ALEN);
-               memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);
-               memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN);
-               mgmt->u.beacon.beacon_int =
-                       cpu_to_le16(local->hw.conf.beacon_int);
-               mgmt->u.beacon.timestamp = cpu_to_le64(bss->timestamp);
-               mgmt->u.beacon.capab_info = cpu_to_le16(bss->capability);
-
-               pos = skb_put(skb, 2 + ifsta->ssid_len);
-               *pos++ = WLAN_EID_SSID;
-               *pos++ = ifsta->ssid_len;
-               memcpy(pos, ifsta->ssid, ifsta->ssid_len);
-
-               rates = bss->supp_rates_len;
-               if (rates > 8)
-                       rates = 8;
-               pos = skb_put(skb, 2 + rates);
-               *pos++ = WLAN_EID_SUPP_RATES;
-               *pos++ = rates;
-               memcpy(pos, bss->supp_rates, rates);
+       skb_reserve(skb, local->hw.extra_tx_headroom);
 
-               if (bss->band == IEEE80211_BAND_2GHZ) {
-                       pos = skb_put(skb, 2 + 1);
-                       *pos++ = WLAN_EID_DS_PARAMS;
-                       *pos++ = 1;
-                       *pos++ = ieee80211_frequency_to_channel(bss->freq);
-               }
+       mgmt = (struct ieee80211_mgmt *)
+               skb_put(skb, 24 + sizeof(mgmt->u.beacon));
+       memset(mgmt, 0, 24 + sizeof(mgmt->u.beacon));
+       mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
+                                               IEEE80211_STYPE_PROBE_RESP);
+       memset(mgmt->da, 0xff, ETH_ALEN);
+       memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);
+       memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN);
+       mgmt->u.beacon.beacon_int =
+               cpu_to_le16(local->hw.conf.beacon_int);
+       mgmt->u.beacon.timestamp = cpu_to_le64(bss->timestamp);
+       mgmt->u.beacon.capab_info = cpu_to_le16(bss->capability);
 
-               pos = skb_put(skb, 2 + 2);
-               *pos++ = WLAN_EID_IBSS_PARAMS;
-               *pos++ = 2;
-               /* FIX: set ATIM window based on scan results */
-               *pos++ = 0;
-               *pos++ = 0;
+       pos = skb_put(skb, 2 + ifsta->ssid_len);
+       *pos++ = WLAN_EID_SSID;
+       *pos++ = ifsta->ssid_len;
+       memcpy(pos, ifsta->ssid, ifsta->ssid_len);
 
-               if (bss->supp_rates_len > 8) {
-                       rates = bss->supp_rates_len - 8;
-                       pos = skb_put(skb, 2 + rates);
-                       *pos++ = WLAN_EID_EXT_SUPP_RATES;
-                       *pos++ = rates;
-                       memcpy(pos, &bss->supp_rates[8], rates);
-               }
+       rates = bss->supp_rates_len;
+       if (rates > 8)
+               rates = 8;
+       pos = skb_put(skb, 2 + rates);
+       *pos++ = WLAN_EID_SUPP_RATES;
+       *pos++ = rates;
+       memcpy(pos, bss->supp_rates, rates);
+
+       if (bss->band == IEEE80211_BAND_2GHZ) {
+               pos = skb_put(skb, 2 + 1);
+               *pos++ = WLAN_EID_DS_PARAMS;
+               *pos++ = 1;
+               *pos++ = ieee80211_frequency_to_channel(bss->freq);
+       }
 
-               ifsta->probe_resp = skb;
+       pos = skb_put(skb, 2 + 2);
+       *pos++ = WLAN_EID_IBSS_PARAMS;
+       *pos++ = 2;
+       /* FIX: set ATIM window based on scan results */
+       *pos++ = 0;
+       *pos++ = 0;
 
-               ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON);
+       if (bss->supp_rates_len > 8) {
+               rates = bss->supp_rates_len - 8;
+               pos = skb_put(skb, 2 + rates);
+               *pos++ = WLAN_EID_EXT_SUPP_RATES;
+               *pos++ = rates;
+               memcpy(pos, &bss->supp_rates[8], rates);
        }
 
+       ifsta->probe_resp = skb;
+
+       ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON);
+
+
        rates = 0;
        sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
        for (i = 0; i < bss->supp_rates_len; i++) {
@@ -1423,6 +1557,8 @@ static int ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
        ifsta->state = IEEE80211_STA_MLME_IBSS_JOINED;
        mod_timer(&ifsta->timer, jiffies + IEEE80211_IBSS_MERGE_INTERVAL);
 
+       ieee80211_led_assoc(local, true);
+
        memset(&wrqu, 0, sizeof(wrqu));
        memcpy(wrqu.ap_addr.sa_data, bss->bssid, ETH_ALEN);
        wireless_send_event(sdata->dev, SIOCGIWAP, &wrqu, NULL);
@@ -1430,70 +1566,6 @@ static int ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
        return res;
 }
 
-u64 ieee80211_sta_get_rates(struct ieee80211_local *local,
-                           struct ieee802_11_elems *elems,
-                           enum ieee80211_band band)
-{
-       struct ieee80211_supported_band *sband;
-       struct ieee80211_rate *bitrates;
-       size_t num_rates;
-       u64 supp_rates;
-       int i, j;
-       sband = local->hw.wiphy->bands[band];
-
-       if (!sband) {
-               WARN_ON(1);
-               sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
-       }
-
-       bitrates = sband->bitrates;
-       num_rates = sband->n_bitrates;
-       supp_rates = 0;
-       for (i = 0; i < elems->supp_rates_len +
-                    elems->ext_supp_rates_len; i++) {
-               u8 rate = 0;
-               int own_rate;
-               if (i < elems->supp_rates_len)
-                       rate = elems->supp_rates[i];
-               else if (elems->ext_supp_rates)
-                       rate = elems->ext_supp_rates
-                               [i - elems->supp_rates_len];
-               own_rate = 5 * (rate & 0x7f);
-               for (j = 0; j < num_rates; j++)
-                       if (bitrates[j].bitrate == own_rate)
-                               supp_rates |= BIT(j);
-       }
-       return supp_rates;
-}
-
-static u64 ieee80211_sta_get_mandatory_rates(struct ieee80211_local *local,
-                                       enum ieee80211_band band)
-{
-       struct ieee80211_supported_band *sband;
-       struct ieee80211_rate *bitrates;
-       u64 mandatory_rates;
-       enum ieee80211_rate_flags mandatory_flag;
-       int i;
-
-       sband = local->hw.wiphy->bands[band];
-       if (!sband) {
-               WARN_ON(1);
-               sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
-       }
-
-       if (band == IEEE80211_BAND_2GHZ)
-               mandatory_flag = IEEE80211_RATE_MANDATORY_B;
-       else
-               mandatory_flag = IEEE80211_RATE_MANDATORY_A;
-
-       bitrates = sband->bitrates;
-       mandatory_rates = 0;
-       for (i = 0; i < sband->n_bitrates; i++)
-               if (bitrates[i].flags & mandatory_flag)
-                       mandatory_rates |= BIT(i);
-       return mandatory_rates;
-}
-
 static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                                  struct ieee80211_mgmt *mgmt,
                                  size_t len,
@@ -1503,14 +1575,12 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
 {
        struct ieee80211_local *local = sdata->local;
        int freq;
-       struct ieee80211_sta_bss *bss;
+       struct ieee80211_bss *bss;
        struct sta_info *sta;
        struct ieee80211_channel *channel;
        u64 beacon_timestamp, rx_timestamp;
        u64 supp_rates = 0;
        enum ieee80211_band band = rx_status->band;
-       DECLARE_MAC_BUF(mac);
-       DECLARE_MAC_BUF(mac2);
 
        if (elems->ds_params && elems->ds_params_len == 1)
                freq = ieee80211_channel_to_frequency(elems->ds_params[0]);
@@ -1522,15 +1592,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
        if (!channel || channel->flags & IEEE80211_CHAN_DISABLED)
                return;
 
-       if (ieee80211_vif_is_mesh(&sdata->vif) && elems->mesh_id &&
-           elems->mesh_config && mesh_matches_local(elems, sdata)) {
-               supp_rates = ieee80211_sta_get_rates(local, elems, band);
-
-               mesh_neighbour_update(mgmt->sa, supp_rates, sdata,
-                                     mesh_peer_accepts_plinks(elems));
-       }
-
-       if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS && elems->supp_rates &&
+       if (sdata->vif.type == NL80211_IFTYPE_ADHOC && elems->supp_rates &&
            memcmp(mgmt->bssid, sdata->u.sta.bssid, ETH_ALEN) == 0) {
                supp_rates = ieee80211_sta_get_rates(local, elems, band);
 
@@ -1540,24 +1602,24 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                if (sta) {
                        u64 prev_rates;
 
-                       prev_rates = sta->supp_rates[band];
+                       prev_rates = sta->sta.supp_rates[band];
                        /* make sure mandatory rates are always added */
-                       sta->supp_rates[band] = supp_rates |
-                               ieee80211_sta_get_mandatory_rates(local, band);
+                       sta->sta.supp_rates[band] = supp_rates |
+                               ieee80211_mandatory_rates(local, band);
 
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
-                       if (sta->supp_rates[band] != prev_rates)
+                       if (sta->sta.supp_rates[band] != prev_rates)
                                printk(KERN_DEBUG "%s: updated supp_rates set "
-                                   "for %s based on beacon info (0x%llx | "
+                                   "for %pM based on beacon info (0x%llx | "
                                    "0x%llx -> 0x%llx)\n",
-                                   sdata->dev->name, print_mac(mac, sta->addr),
+                                   sdata->dev->name,
+                                   sta->sta.addr,
                                    (unsigned long long) prev_rates,
                                    (unsigned long long) supp_rates,
-                                   (unsigned long long) sta->supp_rates[band]);
+                                   (unsigned long long) sta->sta.supp_rates[band]);
 #endif
                } else {
-                       ieee80211_ibss_add_sta(sdata, NULL, mgmt->bssid,
-                                              mgmt->sa, supp_rates);
+                       ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, supp_rates);
                }
 
                rcu_read_unlock();
@@ -1568,6 +1630,13 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
        if (!bss)
                return;
 
+       if (elems->ch_switch_elem && (elems->ch_switch_elem_len == 3) &&
+           (memcmp(mgmt->bssid, sdata->u.sta.bssid, ETH_ALEN) == 0)) {
+               struct ieee80211_channel_sw_ie *sw_elem =
+                       (struct ieee80211_channel_sw_ie *)elems->ch_switch_elem;
+               ieee80211_process_chanswitch(sdata, sw_elem, bss);
+       }
+
        /* was just updated in ieee80211_bss_info_update */
        beacon_timestamp = bss->timestamp;
 
@@ -1575,14 +1644,15 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
         * In STA mode, the remaining parameters should not be overridden
         * by beacons because they're not necessarily accurate there.
         */
-       if (sdata->vif.type != IEEE80211_IF_TYPE_IBSS &&
+       if (sdata->vif.type != NL80211_IFTYPE_ADHOC &&
            bss->last_probe_resp && beacon) {
                ieee80211_rx_bss_put(local, bss);
                return;
        }
 
        /* check if we need to merge IBSS */
-       if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS && beacon &&
+       if (sdata->vif.type == NL80211_IFTYPE_ADHOC && beacon &&
+           (!(sdata->u.sta.flags & IEEE80211_STA_BSSID_SET)) &&
            bss->capability & WLAN_CAPABILITY_IBSS &&
            bss->freq == local->oper_channel->center_freq &&
            elems->ssid_len == sdata->u.sta.ssid_len &&
@@ -1604,8 +1674,13 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                         * e.g: at 1 MBit that means mactime is 192 usec earlier
                         * (=24 bytes * 8 usecs/byte) than the beacon timestamp.
                         */
-                       int rate = local->hw.wiphy->bands[band]->
+                       int rate;
+                       if (rx_status->flag & RX_FLAG_HT) {
+                               rate = 65; /* TODO: HT rates */
+                       } else {
+                               rate = local->hw.wiphy->bands[band]->
                                        bitrates[rx_status->rate_idx].bitrate;
+                       }
                        rx_timestamp = rx_status->mactime + (24 * 8 * 10 / rate);
                } else if (local && local->ops && local->ops->get_tsf)
                        /* second best option: get current TSF */
@@ -1614,10 +1689,9 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                        /* can't merge without knowing the TSF */
                        rx_timestamp = -1LLU;
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
-               printk(KERN_DEBUG "RX beacon SA=%s BSSID="
-                      "%s TSF=0x%llx BCN=0x%llx diff=%lld @%lu\n",
-                      print_mac(mac, mgmt->sa),
-                      print_mac(mac2, mgmt->bssid),
+               printk(KERN_DEBUG "RX beacon SA=%pM BSSID="
+                      "%pM TSF=0x%llx BCN=0x%llx diff=%lld @%lu\n",
+                      mgmt->sa, mgmt->bssid,
                       (unsigned long long)rx_timestamp,
                       (unsigned long long)beacon_timestamp,
                       (unsigned long long)(rx_timestamp - beacon_timestamp),
@@ -1626,13 +1700,11 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                if (beacon_timestamp > rx_timestamp) {
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
                        printk(KERN_DEBUG "%s: beacon TSF higher than "
-                              "local TSF - IBSS merge with BSSID %s\n",
-                              sdata->dev->name, print_mac(mac, mgmt->bssid));
+                              "local TSF - IBSS merge with BSSID %pM\n",
+                              sdata->dev->name, mgmt->bssid);
 #endif
                        ieee80211_sta_join_ibss(sdata, &sdata->u.sta, bss);
-                       ieee80211_ibss_add_sta(sdata, NULL,
-                                              mgmt->bssid, mgmt->sa,
-                                              supp_rates);
+                       ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, supp_rates);
                }
        }
 
@@ -1680,8 +1752,9 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
        size_t baselen;
        struct ieee802_11_elems elems;
        struct ieee80211_local *local = sdata->local;
-       struct ieee80211_conf *conf = &local->hw.conf;
        u32 changed = 0;
+       bool erp_valid, directed_tim, is_mc = false;
+       u8 erp_value = 0;
 
        /* Process beacon from the current BSS */
        baselen = (u8 *) mgmt->u.beacon.variable - (u8 *) mgmt;
@@ -1692,7 +1765,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
 
        ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems, true);
 
-       if (sdata->vif.type != IEEE80211_IF_TYPE_STA)
+       if (sdata->vif.type != NL80211_IFTYPE_STATION)
                return;
        ifsta = &sdata->u.sta;
 
@@ -1700,26 +1773,67 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
            memcmp(ifsta->bssid, mgmt->bssid, ETH_ALEN) != 0)
                return;
 
+       if (rx_status->freq != local->hw.conf.channel->center_freq)
+               return;
+
        ieee80211_sta_wmm_params(local, ifsta, elems.wmm_param,
                                 elems.wmm_param_len);
 
-       if (elems.erp_info && elems.erp_info_len >= 1)
-               changed |= ieee80211_handle_erp_ie(sdata, elems.erp_info[0]);
-       else {
-               u16 capab = le16_to_cpu(mgmt->u.beacon.capab_info);
-               changed |= ieee80211_handle_protect_preamb(sdata, false,
-                               (capab & WLAN_CAPABILITY_SHORT_PREAMBLE) != 0);
+       if (!(local->hw.flags & IEEE80211_HW_NO_STACK_DYNAMIC_PS)) {
+               directed_tim = check_tim(&elems, ifsta->aid, &is_mc);
+
+               if (directed_tim || is_mc) {
+                       if (local->hw.conf.flags && IEEE80211_CONF_PS) {
+                               local->hw.conf.flags &= ~IEEE80211_CONF_PS;
+                               ieee80211_hw_config(local,
+                                               IEEE80211_CONF_CHANGE_PS);
+                               ieee80211_send_nullfunc(local, sdata, 0);
+                       }
+               }
+       }
+
+       if (elems.erp_info && elems.erp_info_len >= 1) {
+               erp_valid = true;
+               erp_value = elems.erp_info[0];
+       } else {
+               erp_valid = false;
        }
+       changed |= ieee80211_handle_bss_capability(sdata,
+                       le16_to_cpu(mgmt->u.beacon.capab_info),
+                       erp_valid, erp_value);
+
 
-       if (elems.ht_cap_elem && elems.ht_info_elem &&
-           elems.wmm_param && conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE) {
-               struct ieee80211_ht_bss_info bss_info;
+       if (elems.ht_cap_elem && elems.ht_info_elem && elems.wmm_param) {
+               struct sta_info *sta;
+               struct ieee80211_supported_band *sband;
+               u16 ap_ht_cap_flags;
 
-               ieee80211_ht_addt_info_ie_to_ht_bss_info(
-                               (struct ieee80211_ht_addt_info *)
-                               elems.ht_info_elem, &bss_info);
-               changed |= ieee80211_handle_ht(local, 1, &conf->ht_conf,
-                                              &bss_info);
+               rcu_read_lock();
+
+               sta = sta_info_get(local, ifsta->bssid);
+               if (!sta) {
+                       rcu_read_unlock();
+                       return;
+               }
+
+               sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
+
+               ieee80211_ht_cap_ie_to_sta_ht_cap(sband,
+                               elems.ht_cap_elem, &sta->sta.ht_cap);
+
+               ap_ht_cap_flags = sta->sta.ht_cap.cap;
+
+               rcu_read_unlock();
+
+               changed |= ieee80211_enable_ht(sdata, elems.ht_info_elem,
+                                              ap_ht_cap_flags);
+       }
+
+       if (elems.country_elem) {
+               /* Note we are only reviewing this on beacons
+                * for the BSSID we are associated to */
+               regulatory_hint_11d(local->hw.wiphy,
+                       elems.country_elem, elems.country_elem_len);
        }
 
        ieee80211_bss_info_change_notify(sdata, changed);
@@ -1729,21 +1843,15 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
 static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
                                        struct ieee80211_if_sta *ifsta,
                                        struct ieee80211_mgmt *mgmt,
-                                       size_t len,
-                                       struct ieee80211_rx_status *rx_status)
+                                       size_t len)
 {
        struct ieee80211_local *local = sdata->local;
        int tx_last_beacon;
        struct sk_buff *skb;
        struct ieee80211_mgmt *resp;
        u8 *pos, *end;
-       DECLARE_MAC_BUF(mac);
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-       DECLARE_MAC_BUF(mac2);
-       DECLARE_MAC_BUF(mac3);
-#endif
 
-       if (sdata->vif.type != IEEE80211_IF_TYPE_IBSS ||
+       if (sdata->vif.type != NL80211_IFTYPE_ADHOC ||
            ifsta->state != IEEE80211_STA_MLME_IBSS_JOINED ||
            len < 24 + 2 || !ifsta->probe_resp)
                return;
@@ -1754,10 +1862,10 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
                tx_last_beacon = 1;
 
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
-       printk(KERN_DEBUG "%s: RX ProbeReq SA=%s DA=%s BSSID="
-              "%s (tx_last_beacon=%d)\n",
-              sdata->dev->name, print_mac(mac, mgmt->sa), print_mac(mac2, mgmt->da),
-              print_mac(mac3, mgmt->bssid), tx_last_beacon);
+       printk(KERN_DEBUG "%s: RX ProbeReq SA=%pM DA=%pM BSSID=%pM"
+              " (tx_last_beacon=%d)\n",
+              sdata->dev->name, mgmt->sa, mgmt->da,
+              mgmt->bssid, tx_last_beacon);
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
 
        if (!tx_last_beacon)
@@ -1773,8 +1881,8 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
            pos + 2 + pos[1] > end) {
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
                printk(KERN_DEBUG "%s: Invalid SSID IE in ProbeReq "
-                      "from %s\n",
-                      sdata->dev->name, print_mac(mac, mgmt->sa));
+                      "from %pM\n",
+                      sdata->dev->name, mgmt->sa);
 #endif
                return;
        }
@@ -1793,30 +1901,10 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
        resp = (struct ieee80211_mgmt *) skb->data;
        memcpy(resp->da, mgmt->sa, ETH_ALEN);
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
-       printk(KERN_DEBUG "%s: Sending ProbeResp to %s\n",
-              sdata->dev->name, print_mac(mac, resp->da));
+       printk(KERN_DEBUG "%s: Sending ProbeResp to %pM\n",
+              sdata->dev->name, resp->da);
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
-       ieee80211_sta_tx(sdata, skb, 0);
-}
-
-static void ieee80211_rx_mgmt_action(struct ieee80211_sub_if_data *sdata,
-                                    struct ieee80211_if_sta *ifsta,
-                                    struct ieee80211_mgmt *mgmt,
-                                    size_t len,
-                                    struct ieee80211_rx_status *rx_status)
-{
-       /* currently we only handle mesh interface action frames here */
-       if (!ieee80211_vif_is_mesh(&sdata->vif))
-               return;
-
-       switch (mgmt->u.action.category) {
-       case PLINK_CATEGORY:
-               mesh_rx_plink_frame(sdata, mgmt, len, rx_status);
-               break;
-       case MESH_PATH_SEL_CATEGORY:
-               mesh_rx_path_sel_frame(sdata, mgmt, len);
-               break;
-       }
+       ieee80211_tx_skb(sdata, skb, 0);
 }
 
 void ieee80211_sta_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,
@@ -1839,7 +1927,6 @@ void ieee80211_sta_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *
        case IEEE80211_STYPE_PROBE_REQ:
        case IEEE80211_STYPE_PROBE_RESP:
        case IEEE80211_STYPE_BEACON:
-       case IEEE80211_STYPE_ACTION:
                memcpy(skb->cb, rx_status, sizeof(*rx_status));
        case IEEE80211_STYPE_AUTH:
        case IEEE80211_STYPE_ASSOC_RESP:
@@ -1871,8 +1958,7 @@ static void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
 
        switch (fc & IEEE80211_FCTL_STYPE) {
        case IEEE80211_STYPE_PROBE_REQ:
-               ieee80211_rx_mgmt_probe_req(sdata, ifsta, mgmt, skb->len,
-                                           rx_status);
+               ieee80211_rx_mgmt_probe_req(sdata, ifsta, mgmt, skb->len);
                break;
        case IEEE80211_STYPE_PROBE_RESP:
                ieee80211_rx_mgmt_probe_resp(sdata, mgmt, skb->len, rx_status);
@@ -1895,9 +1981,6 @@ static void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
        case IEEE80211_STYPE_DISASSOC:
                ieee80211_rx_mgmt_disassoc(sdata, ifsta, mgmt, skb->len);
                break;
-       case IEEE80211_STYPE_ACTION:
-               ieee80211_rx_mgmt_action(sdata, ifsta, mgmt, skb->len, rx_status);
-               break;
        }
 
        kfree_skb(skb);
@@ -1927,32 +2010,6 @@ static int ieee80211_sta_active_ibss(struct ieee80211_sub_if_data *sdata)
 }
 
 
-static void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata, unsigned long exp_time)
-{
-       struct ieee80211_local *local = sdata->local;
-       struct sta_info *sta, *tmp;
-       LIST_HEAD(tmp_list);
-       DECLARE_MAC_BUF(mac);
-       unsigned long flags;
-
-       spin_lock_irqsave(&local->sta_lock, flags);
-       list_for_each_entry_safe(sta, tmp, &local->sta_list, list)
-               if (time_after(jiffies, sta->last_rx + exp_time)) {
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-                       printk(KERN_DEBUG "%s: expiring inactive STA %s\n",
-                              sdata->dev->name, print_mac(mac, sta->addr));
-#endif
-                       __sta_info_unlink(&sta);
-                       if (sta)
-                               list_add(&sta->list, &tmp_list);
-               }
-       spin_unlock_irqrestore(&local->sta_lock, flags);
-
-       list_for_each_entry_safe(sta, tmp, &tmp_list, list)
-               sta_info_destroy(sta);
-}
-
-
 static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata,
                                     struct ieee80211_if_sta *ifsta)
 {
@@ -1962,42 +2019,17 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata,
        if (ieee80211_sta_active_ibss(sdata))
                return;
 
+       if ((sdata->u.sta.flags & IEEE80211_STA_BSSID_SET) &&
+           (!(sdata->u.sta.flags & IEEE80211_STA_AUTO_CHANNEL_SEL)))
+               return;
+
        printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other "
               "IBSS networks with same SSID (merge)\n", sdata->dev->name);
-       ieee80211_sta_req_scan(sdata, ifsta->ssid, ifsta->ssid_len);
-}
-
-
-#ifdef CONFIG_MAC80211_MESH
-static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata,
-                          struct ieee80211_if_sta *ifsta)
-{
-       bool free_plinks;
-
-       ieee80211_sta_expire(sdata, IEEE80211_MESH_PEER_INACTIVITY_LIMIT);
-       mesh_path_expire(sdata);
-
-       free_plinks = mesh_plink_availables(sdata);
-       if (free_plinks != sdata->u.sta.accepting_plinks)
-               ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON);
-
-       mod_timer(&ifsta->timer, jiffies +
-                       IEEE80211_MESH_HOUSEKEEPING_INTERVAL);
-}
-
-
-void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)
-{
-       struct ieee80211_if_sta *ifsta;
-       ifsta = &sdata->u.sta;
-       ifsta->state = IEEE80211_STA_MLME_MESH_UP;
-       ieee80211_sta_timer((unsigned long)sdata);
-       ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON);
+       ieee80211_request_scan(sdata, ifsta->ssid, ifsta->ssid_len);
 }
-#endif
 
 
-void ieee80211_sta_timer(unsigned long data)
+static void ieee80211_sta_timer(unsigned long data)
 {
        struct ieee80211_sub_if_data *sdata =
                (struct ieee80211_sub_if_data *) data;
@@ -2040,28 +2072,6 @@ static void ieee80211_sta_reset_auth(struct ieee80211_sub_if_data *sdata,
 }
 
 
-void ieee80211_sta_req_auth(struct ieee80211_sub_if_data *sdata,
-                           struct ieee80211_if_sta *ifsta)
-{
-       struct ieee80211_local *local = sdata->local;
-
-       if (sdata->vif.type != IEEE80211_IF_TYPE_STA)
-               return;
-
-       if ((ifsta->flags & (IEEE80211_STA_BSSID_SET |
-                            IEEE80211_STA_AUTO_BSSID_SEL)) &&
-           (ifsta->flags & (IEEE80211_STA_SSID_SET |
-                            IEEE80211_STA_AUTO_SSID_SEL))) {
-
-               if (ifsta->state == IEEE80211_STA_MLME_ASSOCIATED)
-                       ieee80211_set_disassoc(sdata, ifsta, true, true,
-                                              WLAN_REASON_DEAUTH_LEAVING);
-
-               set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);
-               queue_work(local->hw.workqueue, &ifsta->work);
-       }
-}
-
 static int ieee80211_sta_match_ssid(struct ieee80211_if_sta *ifsta,
                                    const char *ssid, int ssid_len)
 {
@@ -2083,7 +2093,7 @@ static int ieee80211_sta_match_ssid(struct ieee80211_if_sta *ifsta,
                }
        }
 
-       if (hidden_ssid && ifsta->ssid_len == ssid_len)
+       if (hidden_ssid && (ifsta->ssid_len == ssid_len || ssid_len == 0))
                return 1;
 
        if (ssid_len == 1 && ssid[0] == ' ')
@@ -2096,12 +2106,11 @@ static int ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata,
                                     struct ieee80211_if_sta *ifsta)
 {
        struct ieee80211_local *local = sdata->local;
-       struct ieee80211_sta_bss *bss;
+       struct ieee80211_bss *bss;
        struct ieee80211_supported_band *sband;
        u8 bssid[ETH_ALEN], *pos;
        int i;
        int ret;
-       DECLARE_MAC_BUF(mac);
 
 #if 0
        /* Easier testing, use fixed BSSID. */
@@ -2117,8 +2126,8 @@ static int ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata,
        bssid[0] |= 0x02;
 #endif
 
-       printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID %s\n",
-              sdata->dev->name, print_mac(mac, bssid));
+       printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID %pM\n",
+              sdata->dev->name, bssid);
 
        bss = ieee80211_rx_bss_add(local, bssid,
                                   local->hw.conf.channel->center_freq,
@@ -2157,12 +2166,10 @@ static int ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata,
                                   struct ieee80211_if_sta *ifsta)
 {
        struct ieee80211_local *local = sdata->local;
-       struct ieee80211_sta_bss *bss;
+       struct ieee80211_bss *bss;
        int found = 0;
        u8 bssid[ETH_ALEN];
        int active_ibss;
-       DECLARE_MAC_BUF(mac);
-       DECLARE_MAC_BUF(mac2);
 
        if (ifsta->ssid_len == 0)
                return -EINVAL;
@@ -2172,28 +2179,26 @@ static int ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata,
        printk(KERN_DEBUG "%s: sta_find_ibss (active_ibss=%d)\n",
               sdata->dev->name, active_ibss);
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
-       spin_lock_bh(&local->sta_bss_lock);
-       list_for_each_entry(bss, &local->sta_bss_list, list) {
+       spin_lock_bh(&local->bss_lock);
+       list_for_each_entry(bss, &local->bss_list, list) {
                if (ifsta->ssid_len != bss->ssid_len ||
                    memcmp(ifsta->ssid, bss->ssid, bss->ssid_len) != 0
                    || !(bss->capability & WLAN_CAPABILITY_IBSS))
                        continue;
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
-               printk(KERN_DEBUG "   bssid=%s found\n",
-                      print_mac(mac, bss->bssid));
+               printk(KERN_DEBUG "   bssid=%pM found\n", bss->bssid);
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
                memcpy(bssid, bss->bssid, ETH_ALEN);
                found = 1;
                if (active_ibss || memcmp(bssid, ifsta->bssid, ETH_ALEN) != 0)
                        break;
        }
-       spin_unlock_bh(&local->sta_bss_lock);
+       spin_unlock_bh(&local->bss_lock);
 
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
        if (found)
-               printk(KERN_DEBUG "   sta_find_ibss: selected %s current "
-                      "%s\n", print_mac(mac, bssid),
-                      print_mac(mac2, ifsta->bssid));
+               printk(KERN_DEBUG "   sta_find_ibss: selected %pM current "
+                      "%pM\n", bssid, ifsta->bssid);
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
 
        if (found && memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0) {
@@ -2210,9 +2215,9 @@ static int ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata,
                if (!bss)
                        goto dont_join;
 
-               printk(KERN_DEBUG "%s: Selected IBSS BSSID %s"
+               printk(KERN_DEBUG "%s: Selected IBSS BSSID %pM"
                       " based on configured SSID\n",
-                      sdata->dev->name, print_mac(mac, bssid));
+                      sdata->dev->name, bssid);
                ret = ieee80211_sta_join_ibss(sdata, ifsta, bss);
                ieee80211_rx_bss_put(local, bss);
                return ret;
@@ -2232,7 +2237,7 @@ dont_join:
                              IEEE80211_SCAN_INTERVAL)) {
                printk(KERN_DEBUG "%s: Trigger new scan to find an IBSS to "
                       "join\n", sdata->dev->name);
-               return ieee80211_sta_req_scan(sdata, ifsta->ssid,
+               return ieee80211_request_scan(sdata, ifsta->ssid,
                                              ifsta->ssid_len);
        } else if (ifsta->state != IEEE80211_STA_MLME_IBSS_JOINED) {
                int interval = IEEE80211_SCAN_INTERVAL;
@@ -2263,169 +2268,16 @@ dont_join:
 }
 
 
-int ieee80211_sta_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t len)
-{
-       struct ieee80211_if_sta *ifsta;
-       int res;
-
-       if (len > IEEE80211_MAX_SSID_LEN)
-               return -EINVAL;
-
-       ifsta = &sdata->u.sta;
-
-       if (ifsta->ssid_len != len || memcmp(ifsta->ssid, ssid, len) != 0) {
-               memset(ifsta->ssid, 0, sizeof(ifsta->ssid));
-               memcpy(ifsta->ssid, ssid, len);
-               ifsta->ssid_len = len;
-               ifsta->flags &= ~IEEE80211_STA_PREV_BSSID_SET;
-
-               res = 0;
-               /*
-                * Hack! MLME code needs to be cleaned up to have different
-                * entry points for configuration and internal selection change
-                */
-               if (netif_running(sdata->dev))
-                       res = ieee80211_if_config(sdata, IEEE80211_IFCC_SSID);
-               if (res) {
-                       printk(KERN_DEBUG "%s: Failed to config new SSID to "
-                              "the low-level driver\n", sdata->dev->name);
-                       return res;
-               }
-       }
-
-       if (len)
-               ifsta->flags |= IEEE80211_STA_SSID_SET;
-       else
-               ifsta->flags &= ~IEEE80211_STA_SSID_SET;
-
-       if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS &&
-           !(ifsta->flags & IEEE80211_STA_BSSID_SET)) {
-               ifsta->ibss_join_req = jiffies;
-               ifsta->state = IEEE80211_STA_MLME_IBSS_SEARCH;
-               return ieee80211_sta_find_ibss(sdata, ifsta);
-       }
-
-       return 0;
-}
-
-
-int ieee80211_sta_get_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t *len)
-{
-       struct ieee80211_if_sta *ifsta = &sdata->u.sta;
-       memcpy(ssid, ifsta->ssid, ifsta->ssid_len);
-       *len = ifsta->ssid_len;
-       return 0;
-}
-
-
-int ieee80211_sta_set_bssid(struct ieee80211_sub_if_data *sdata, u8 *bssid)
-{
-       struct ieee80211_if_sta *ifsta;
-       int res;
-
-       ifsta = &sdata->u.sta;
-
-       if (memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0) {
-               memcpy(ifsta->bssid, bssid, ETH_ALEN);
-               res = 0;
-               /*
-                * Hack! See also ieee80211_sta_set_ssid.
-                */
-               if (netif_running(sdata->dev))
-                       res = ieee80211_if_config(sdata, IEEE80211_IFCC_BSSID);
-               if (res) {
-                       printk(KERN_DEBUG "%s: Failed to config new BSSID to "
-                              "the low-level driver\n", sdata->dev->name);
-                       return res;
-               }
-       }
-
-       if (is_valid_ether_addr(bssid))
-               ifsta->flags |= IEEE80211_STA_BSSID_SET;
-       else
-               ifsta->flags &= ~IEEE80211_STA_BSSID_SET;
-
-       return 0;
-}
-
-
-int ieee80211_sta_set_extra_ie(struct ieee80211_sub_if_data *sdata, char *ie, size_t len)
-{
-       struct ieee80211_if_sta *ifsta = &sdata->u.sta;
-
-       kfree(ifsta->extra_ie);
-       if (len == 0) {
-               ifsta->extra_ie = NULL;
-               ifsta->extra_ie_len = 0;
-               return 0;
-       }
-       ifsta->extra_ie = kmalloc(len, GFP_KERNEL);
-       if (!ifsta->extra_ie) {
-               ifsta->extra_ie_len = 0;
-               return -ENOMEM;
-       }
-       memcpy(ifsta->extra_ie, ie, len);
-       ifsta->extra_ie_len = len;
-       return 0;
-}
-
-
-struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,
-                                       struct sk_buff *skb, u8 *bssid,
-                                       u8 *addr, u64 supp_rates)
-{
-       struct ieee80211_local *local = sdata->local;
-       struct sta_info *sta;
-       DECLARE_MAC_BUF(mac);
-       int band = local->hw.conf.channel->band;
-
-       /* TODO: Could consider removing the least recently used entry and
-        * allow new one to be added. */
-       if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
-               if (net_ratelimit()) {
-                       printk(KERN_DEBUG "%s: No room for a new IBSS STA "
-                              "entry %s\n", sdata->dev->name, print_mac(mac, addr));
-               }
-               return NULL;
-       }
-
-       if (compare_ether_addr(bssid, sdata->u.sta.bssid))
-               return NULL;
-
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-       printk(KERN_DEBUG "%s: Adding new IBSS station %s (dev=%s)\n",
-              wiphy_name(local->hw.wiphy), print_mac(mac, addr), sdata->dev->name);
-#endif
-
-       sta = sta_info_alloc(sdata, addr, GFP_ATOMIC);
-       if (!sta)
-               return NULL;
-
-       set_sta_flags(sta, WLAN_STA_AUTHORIZED);
-
-       /* make sure mandatory rates are always added */
-       sta->supp_rates[band] = supp_rates |
-                       ieee80211_sta_get_mandatory_rates(local, band);
-
-       rate_control_rate_init(sta, local);
-
-       if (sta_info_insert(sta))
-               return NULL;
-
-       return sta;
-}
-
-
 static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata,
                                     struct ieee80211_if_sta *ifsta)
 {
        struct ieee80211_local *local = sdata->local;
-       struct ieee80211_sta_bss *bss, *selected = NULL;
+       struct ieee80211_bss *bss, *selected = NULL;
        int top_rssi = 0, freq;
 
-       spin_lock_bh(&local->sta_bss_lock);
+       spin_lock_bh(&local->bss_lock);
        freq = local->oper_channel->center_freq;
-       list_for_each_entry(bss, &local->sta_bss_list, list) {
+       list_for_each_entry(bss, &local->bss_list, list) {
                if (!(bss->capability & WLAN_CAPABILITY_ESS))
                        continue;
 
@@ -2455,7 +2307,7 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata,
        }
        if (selected)
                atomic_inc(&selected->users);
-       spin_unlock_bh(&local->sta_bss_lock);
+       spin_unlock_bh(&local->bss_lock);
 
        if (selected) {
                ieee80211_set_freq(sdata, selected->freq);
@@ -2482,9 +2334,9 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata,
                if (ifsta->assoc_scan_tries < IEEE80211_ASSOC_SCANS_MAX_TRIES) {
                        ifsta->assoc_scan_tries++;
                        if (ifsta->flags & IEEE80211_STA_AUTO_SSID_SEL)
-                               ieee80211_sta_start_scan(sdata, NULL, 0);
+                               ieee80211_start_scan(sdata, NULL, 0);
                        else
-                               ieee80211_sta_start_scan(sdata, ifsta->ssid,
+                               ieee80211_start_scan(sdata, ifsta->ssid,
                                                         ifsta->ssid_len);
                        ifsta->state = IEEE80211_STA_MLME_AUTHENTICATE;
                        set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);
@@ -2495,61 +2347,7 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata,
 }
 
 
-int ieee80211_sta_deauthenticate(struct ieee80211_sub_if_data *sdata, u16 reason)
-{
-       struct ieee80211_if_sta *ifsta = &sdata->u.sta;
-
-       printk(KERN_DEBUG "%s: deauthenticating by local choice (reason=%d)\n",
-              sdata->dev->name, reason);
-
-       if (sdata->vif.type != IEEE80211_IF_TYPE_STA &&
-           sdata->vif.type != IEEE80211_IF_TYPE_IBSS)
-               return -EINVAL;
-
-       ieee80211_set_disassoc(sdata, ifsta, true, true, reason);
-       return 0;
-}
-
-
-int ieee80211_sta_disassociate(struct ieee80211_sub_if_data *sdata, u16 reason)
-{
-       struct ieee80211_if_sta *ifsta = &sdata->u.sta;
-
-       printk(KERN_DEBUG "%s: disassociating by local choice (reason=%d)\n",
-              sdata->dev->name, reason);
-
-       if (sdata->vif.type != IEEE80211_IF_TYPE_STA)
-               return -EINVAL;
-
-       if (!(ifsta->flags & IEEE80211_STA_ASSOCIATED))
-               return -1;
-
-       ieee80211_set_disassoc(sdata, ifsta, false, true, reason);
-       return 0;
-}
-
-void ieee80211_notify_mac(struct ieee80211_hw *hw,
-                         enum ieee80211_notification_types  notif_type)
-{
-       struct ieee80211_local *local = hw_to_local(hw);
-       struct ieee80211_sub_if_data *sdata;
-
-       switch (notif_type) {
-       case IEEE80211_NOTIFY_RE_ASSOC:
-               rcu_read_lock();
-               list_for_each_entry_rcu(sdata, &local->interfaces, list) {
-                       if (sdata->vif.type != IEEE80211_IF_TYPE_STA)
-                               continue;
-
-                       ieee80211_sta_req_auth(sdata, &sdata->u.sta);
-               }
-               rcu_read_unlock();
-               break;
-       }
-}
-EXPORT_SYMBOL(ieee80211_notify_mac);
-
-void ieee80211_sta_work(struct work_struct *work)
+static void ieee80211_sta_work(struct work_struct *work)
 {
        struct ieee80211_sub_if_data *sdata =
                container_of(work, struct ieee80211_sub_if_data, u.sta.work);
@@ -2560,30 +2358,23 @@ void ieee80211_sta_work(struct work_struct *work)
        if (!netif_running(sdata->dev))
                return;
 
-       if (local->sta_sw_scanning || local->sta_hw_scanning)
+       if (local->sw_scanning || local->hw_scanning)
                return;
 
-       if (WARN_ON(sdata->vif.type != IEEE80211_IF_TYPE_STA &&
-                   sdata->vif.type != IEEE80211_IF_TYPE_IBSS &&
-                   sdata->vif.type != IEEE80211_IF_TYPE_MESH_POINT))
+       if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_STATION &&
+                   sdata->vif.type != NL80211_IFTYPE_ADHOC))
                return;
        ifsta = &sdata->u.sta;
 
        while ((skb = skb_dequeue(&ifsta->skb_queue)))
                ieee80211_sta_rx_queued_mgmt(sdata, skb);
 
-#ifdef CONFIG_MAC80211_MESH
-       if (ifsta->preq_queue_len &&
-           time_after(jiffies,
-                      ifsta->last_preq + msecs_to_jiffies(ifsta->mshcfg.dot11MeshHWMPpreqMinInterval)))
-               mesh_path_start_discovery(sdata);
-#endif
-
        if (ifsta->state != IEEE80211_STA_MLME_DIRECT_PROBE &&
            ifsta->state != IEEE80211_STA_MLME_AUTHENTICATE &&
            ifsta->state != IEEE80211_STA_MLME_ASSOCIATE &&
            test_and_clear_bit(IEEE80211_STA_REQ_SCAN, &ifsta->request)) {
-               ieee80211_sta_start_scan(sdata, ifsta->scan_ssid, ifsta->scan_ssid_len);
+               ieee80211_start_scan(sdata, ifsta->scan_ssid,
+                                    ifsta->scan_ssid_len);
                return;
        }
 
@@ -2615,11 +2406,6 @@ void ieee80211_sta_work(struct work_struct *work)
        case IEEE80211_STA_MLME_IBSS_JOINED:
                ieee80211_sta_merge_ibss(sdata, ifsta);
                break;
-#ifdef CONFIG_MAC80211_MESH
-       case IEEE80211_STA_MLME_MESH_UP:
-               ieee80211_mesh_housekeeping(sdata, ifsta);
-               break;
-#endif
        default:
                WARN_ON(1);
                break;
@@ -2634,16 +2420,289 @@ void ieee80211_sta_work(struct work_struct *work)
        }
 }
 
+static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata)
+{
+       if (sdata->vif.type == NL80211_IFTYPE_STATION)
+               queue_work(sdata->local->hw.workqueue,
+                          &sdata->u.sta.work);
+}
+
+/* interface setup */
+void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
+{
+       struct ieee80211_if_sta *ifsta;
+
+       ifsta = &sdata->u.sta;
+       INIT_WORK(&ifsta->work, ieee80211_sta_work);
+       INIT_WORK(&ifsta->chswitch_work, ieee80211_chswitch_work);
+       setup_timer(&ifsta->timer, ieee80211_sta_timer,
+                   (unsigned long) sdata);
+       setup_timer(&ifsta->chswitch_timer, ieee80211_chswitch_timer,
+                   (unsigned long) sdata);
+       skb_queue_head_init(&ifsta->skb_queue);
+
+       ifsta->capab = WLAN_CAPABILITY_ESS;
+       ifsta->auth_algs = IEEE80211_AUTH_ALG_OPEN |
+               IEEE80211_AUTH_ALG_SHARED_KEY;
+       ifsta->flags |= IEEE80211_STA_CREATE_IBSS |
+               IEEE80211_STA_AUTO_BSSID_SEL |
+               IEEE80211_STA_AUTO_CHANNEL_SEL;
+       if (ieee80211_num_regular_queues(&sdata->local->hw) >= 4)
+               ifsta->flags |= IEEE80211_STA_WMM_ENABLED;
+}
+
+/*
+ * Add a new IBSS station, will also be called by the RX code when,
+ * in IBSS mode, receiving a frame from a yet-unknown station, hence
+ * must be callable in atomic context.
+ */
+struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,
+                                       u8 *bssid,u8 *addr, u64 supp_rates)
+{
+       struct ieee80211_local *local = sdata->local;
+       struct sta_info *sta;
+       int band = local->hw.conf.channel->band;
+
+       /* TODO: Could consider removing the least recently used entry and
+        * allow new one to be added. */
+       if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
+               if (net_ratelimit()) {
+                       printk(KERN_DEBUG "%s: No room for a new IBSS STA "
+                              "entry %pM\n", sdata->dev->name, addr);
+               }
+               return NULL;
+       }
+
+       if (compare_ether_addr(bssid, sdata->u.sta.bssid))
+               return NULL;
+
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+       printk(KERN_DEBUG "%s: Adding new IBSS station %pM (dev=%s)\n",
+              wiphy_name(local->hw.wiphy), addr, sdata->dev->name);
+#endif
+
+       sta = sta_info_alloc(sdata, addr, GFP_ATOMIC);
+       if (!sta)
+               return NULL;
+
+       set_sta_flags(sta, WLAN_STA_AUTHORIZED);
+
+       /* make sure mandatory rates are always added */
+       sta->sta.supp_rates[band] = supp_rates |
+                       ieee80211_mandatory_rates(local, band);
+
+       rate_control_rate_init(sta);
+
+       if (sta_info_insert(sta))
+               return NULL;
+
+       return sta;
+}
+
+/* configuration hooks */
+void ieee80211_sta_req_auth(struct ieee80211_sub_if_data *sdata,
+                           struct ieee80211_if_sta *ifsta)
+{
+       struct ieee80211_local *local = sdata->local;
+
+       if (sdata->vif.type != NL80211_IFTYPE_STATION)
+               return;
+
+       if ((ifsta->flags & (IEEE80211_STA_BSSID_SET |
+                            IEEE80211_STA_AUTO_BSSID_SEL)) &&
+           (ifsta->flags & (IEEE80211_STA_SSID_SET |
+                            IEEE80211_STA_AUTO_SSID_SEL))) {
+
+               if (ifsta->state == IEEE80211_STA_MLME_ASSOCIATED)
+                       ieee80211_set_disassoc(sdata, ifsta, true, true,
+                                              WLAN_REASON_DEAUTH_LEAVING);
+
+               set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);
+               queue_work(local->hw.workqueue, &ifsta->work);
+       }
+}
+
+int ieee80211_sta_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t len)
+{
+       struct ieee80211_if_sta *ifsta;
+
+       if (len > IEEE80211_MAX_SSID_LEN)
+               return -EINVAL;
+
+       ifsta = &sdata->u.sta;
+
+       if (ifsta->ssid_len != len || memcmp(ifsta->ssid, ssid, len) != 0) {
+               memset(ifsta->ssid, 0, sizeof(ifsta->ssid));
+               memcpy(ifsta->ssid, ssid, len);
+               ifsta->ssid_len = len;
+               ifsta->flags &= ~IEEE80211_STA_PREV_BSSID_SET;
+       }
+
+       if (len)
+               ifsta->flags |= IEEE80211_STA_SSID_SET;
+       else
+               ifsta->flags &= ~IEEE80211_STA_SSID_SET;
+
+       if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
+           !(ifsta->flags & IEEE80211_STA_BSSID_SET)) {
+               ifsta->ibss_join_req = jiffies;
+               ifsta->state = IEEE80211_STA_MLME_IBSS_SEARCH;
+               return ieee80211_sta_find_ibss(sdata, ifsta);
+       }
+
+       return 0;
+}
+
+int ieee80211_sta_get_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t *len)
+{
+       struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+       memcpy(ssid, ifsta->ssid, ifsta->ssid_len);
+       *len = ifsta->ssid_len;
+       return 0;
+}
+
+int ieee80211_sta_set_bssid(struct ieee80211_sub_if_data *sdata, u8 *bssid)
+{
+       struct ieee80211_if_sta *ifsta;
+       int res;
+       bool valid;
+
+       ifsta = &sdata->u.sta;
+       valid = is_valid_ether_addr(bssid);
+
+       if (memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0) {
+               if(valid)
+                       memcpy(ifsta->bssid, bssid, ETH_ALEN);
+               else
+                       memset(ifsta->bssid, 0, ETH_ALEN);
+               res = 0;
+               /*
+                * Hack! See also ieee80211_sta_set_ssid.
+                */
+               if (netif_running(sdata->dev))
+                       res = ieee80211_if_config(sdata, IEEE80211_IFCC_BSSID);
+               if (res) {
+                       printk(KERN_DEBUG "%s: Failed to config new BSSID to "
+                              "the low-level driver\n", sdata->dev->name);
+                       return res;
+               }
+       }
+
+       if (valid)
+               ifsta->flags |= IEEE80211_STA_BSSID_SET;
+       else
+               ifsta->flags &= ~IEEE80211_STA_BSSID_SET;
+
+       return 0;
+}
+
+int ieee80211_sta_set_extra_ie(struct ieee80211_sub_if_data *sdata, char *ie, size_t len)
+{
+       struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+       kfree(ifsta->extra_ie);
+       if (len == 0) {
+               ifsta->extra_ie = NULL;
+               ifsta->extra_ie_len = 0;
+               return 0;
+       }
+       ifsta->extra_ie = kmalloc(len, GFP_KERNEL);
+       if (!ifsta->extra_ie) {
+               ifsta->extra_ie_len = 0;
+               return -ENOMEM;
+       }
+       memcpy(ifsta->extra_ie, ie, len);
+       ifsta->extra_ie_len = len;
+       return 0;
+}
+
+int ieee80211_sta_deauthenticate(struct ieee80211_sub_if_data *sdata, u16 reason)
+{
+       struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+       printk(KERN_DEBUG "%s: deauthenticating by local choice (reason=%d)\n",
+              sdata->dev->name, reason);
+
+       if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+           sdata->vif.type != NL80211_IFTYPE_ADHOC)
+               return -EINVAL;
+
+       ieee80211_set_disassoc(sdata, ifsta, true, true, reason);
+       return 0;
+}
+
+int ieee80211_sta_disassociate(struct ieee80211_sub_if_data *sdata, u16 reason)
+{
+       struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+       printk(KERN_DEBUG "%s: disassociating by local choice (reason=%d)\n",
+              sdata->dev->name, reason);
+
+       if (sdata->vif.type != NL80211_IFTYPE_STATION)
+               return -EINVAL;
+
+       if (!(ifsta->flags & IEEE80211_STA_ASSOCIATED))
+               return -1;
+
+       ieee80211_set_disassoc(sdata, ifsta, false, true, reason);
+       return 0;
+}
+
+/* scan finished notification */
 void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local)
 {
        struct ieee80211_sub_if_data *sdata = local->scan_sdata;
        struct ieee80211_if_sta *ifsta;
 
-       if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS) {
+       if (sdata && sdata->vif.type == NL80211_IFTYPE_ADHOC) {
                ifsta = &sdata->u.sta;
                if (!(ifsta->flags & IEEE80211_STA_BSSID_SET) ||
                    (!(ifsta->state == IEEE80211_STA_MLME_IBSS_JOINED) &&
                    !ieee80211_sta_active_ibss(sdata)))
                        ieee80211_sta_find_ibss(sdata, ifsta);
        }
+
+       /* Restart STA timers */
+       rcu_read_lock();
+       list_for_each_entry_rcu(sdata, &local->interfaces, list)
+               ieee80211_restart_sta_timer(sdata);
+       rcu_read_unlock();
+}
+
+void ieee80211_dynamic_ps_disable_work(struct work_struct *work)
+{
+       struct ieee80211_local *local =
+               container_of(work, struct ieee80211_local,
+                            dynamic_ps_disable_work);
+
+       if (local->hw.conf.flags & IEEE80211_CONF_PS) {
+               local->hw.conf.flags &= ~IEEE80211_CONF_PS;
+               ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
+       }
+
+       ieee80211_wake_queues_by_reason(&local->hw,
+                                       IEEE80211_QUEUE_STOP_REASON_PS);
+}
+
+void ieee80211_dynamic_ps_enable_work(struct work_struct *work)
+{
+       struct ieee80211_local *local =
+               container_of(work, struct ieee80211_local,
+                            dynamic_ps_enable_work);
+       struct ieee80211_sub_if_data *sdata = local->scan_sdata;
+
+       if (local->hw.conf.flags & IEEE80211_CONF_PS)
+               return;
+
+       ieee80211_send_nullfunc(local, sdata, 1);
+       local->hw.conf.flags |= IEEE80211_CONF_PS;
+
+       ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
+}
+
+void ieee80211_dynamic_ps_timer(unsigned long data)
+{
+       struct ieee80211_local *local = (void *) data;
+
+       queue_work(local->hw.workqueue, &local->dynamic_ps_enable_work);
 }