Patched in Tegra support.

1 files changed, 207 insertions, 415 deletions

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 6b7644e818d..56c24cabf26 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -20,12 +20,14 @@
 #include <linux/etherdevice.h>
 #include <linux/rtnetlink.h>
 #include <net/mac80211.h>
+#include <asm/unaligned.h>
 
 #include "ieee80211_i.h"
 #include "driver-ops.h"
 #include "rate.h"
 
 #define IEEE80211_SCAN_INTERVAL (2 * HZ)
+#define IEEE80211_SCAN_INTERVAL_SLOW (15 * HZ)
 #define IEEE80211_IBSS_JOIN_TIMEOUT (7 * HZ)
 
 #define IEEE80211_IBSS_MERGE_INTERVAL (30 * HZ)
@@ -34,12 +36,36 @@
 #define IEEE80211_IBSS_MAX_STA_ENTRIES 128
 
 
+static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
+                                        struct ieee80211_mgmt *mgmt,
+                                        size_t len)
+{
+        u16 auth_alg, auth_transaction;
+
+        lockdep_assert_held(&sdata->u.ibss.mtx);
+
+        if (len < 24 + 6)
+                return;
+
+        auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);
+        auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);
+
+        /*
+         * IEEE 802.11 standard does not require authentication in IBSS
+         * networks and most implementations do not seem to use it.
+         * However, try to reply to authentication attempts if someone
+         * has actually implemented this.
+         */
+        if (auth_alg == WLAN_AUTH_OPEN && auth_transaction == 1)
+                ieee80211_send_auth(sdata, 2, WLAN_AUTH_OPEN, NULL, 0,
+                                    sdata->u.ibss.bssid, NULL, 0, 0);
+}
+
 static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                                       const u8 *bssid, const int beacon_int,
                                       struct ieee80211_channel *chan,
                                       const u32 basic_rates,
-                                      const u16 capability, u64 tsf,
-                                      bool creator)
+                                      const u16 capability, u64 tsf)
 {
         struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
         struct ieee80211_local *local = sdata->local;
@@ -51,50 +77,36 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
         struct cfg80211_bss *bss;
         u32 bss_change;
         u8 supp_rates[IEEE80211_MAX_SUPP_RATES];
-        struct cfg80211_chan_def chandef;
 
         lockdep_assert_held(&ifibss->mtx);
 
         /* Reset own TSF to allow time synchronization work. */
-        drv_reset_tsf(local, sdata);
+        drv_reset_tsf(local);
 
         skb = ifibss->skb;
-        RCU_INIT_POINTER(ifibss->presp, NULL);
+        rcu_assign_pointer(ifibss->presp, NULL);
         synchronize_rcu();
         skb->data = skb->head;
         skb->len = 0;
         skb_reset_tail_pointer(skb);
         skb_reserve(skb, sdata->local->hw.extra_tx_headroom);
 
-        if (!ether_addr_equal(ifibss->bssid, bssid))
+        if (memcmp(ifibss->bssid, bssid, ETH_ALEN))
                 sta_info_flush(sdata->local, sdata);
 
         /* if merging, indicate to driver that we leave the old IBSS */
         if (sdata->vif.bss_conf.ibss_joined) {
                 sdata->vif.bss_conf.ibss_joined = false;
-                sdata->vif.bss_conf.ibss_creator = false;
-                netif_carrier_off(sdata->dev);
                 ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_IBSS);
         }
 
-        sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
-
-        cfg80211_chandef_create(&chandef, chan, ifibss->channel_type);
-        if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef)) {
-                chandef.width = NL80211_CHAN_WIDTH_20;
-                chandef.center_freq1 = chan->center_freq;
-        }
+        memcpy(ifibss->bssid, bssid, ETH_ALEN);
 
-        ieee80211_vif_release_channel(sdata);
-        if (ieee80211_vif_use_channel(sdata, &chandef,
-                                      ifibss->fixed_channel ?
-                                        IEEE80211_CHANCTX_SHARED :
-                                        IEEE80211_CHANCTX_EXCLUSIVE)) {
-                sdata_info(sdata, "Failed to join IBSS, no channel context\n");
-                return;
-        }
+        sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
 
-        memcpy(ifibss->bssid, bssid, ETH_ALEN);
+        local->oper_channel = chan;
+        WARN_ON(!ieee80211_set_channel_type(local, sdata, NL80211_CHAN_NO_HT));
+        ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
 
         sband = local->hw.wiphy->bands[chan->band];
 
@@ -113,7 +125,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
         memset(mgmt, 0, 24 + sizeof(mgmt->u.beacon));
         mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
                                           IEEE80211_STYPE_PROBE_RESP);
-        eth_broadcast_addr(mgmt->da);
+        memset(mgmt->da, 0xff, ETH_ALEN);
         memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
         memcpy(mgmt->bssid, ifibss->bssid, ETH_ALEN);
         mgmt->u.beacon.beacon_int = cpu_to_le16(beacon_int);
@@ -159,24 +171,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                 memcpy(skb_put(skb, ifibss->ie_len),
                        ifibss->ie, ifibss->ie_len);
 
-        /* add HT capability and information IEs */
-        if (chandef.width != NL80211_CHAN_WIDTH_20_NOHT &&
-            sband->ht_cap.ht_supported) {
-                pos = skb_put(skb, 4 +
-                                   sizeof(struct ieee80211_ht_cap) +
-                                   sizeof(struct ieee80211_ht_operation));
-                pos = ieee80211_ie_build_ht_cap(pos, &sband->ht_cap,
-                                                sband->ht_cap.cap);
-                /*
-                 * Note: According to 802.11n-2009 9.13.3.1, HT Protection
-                 * field and RIFS Mode are reserved in IBSS mode, therefore
-                 * keep them at 0
-                 */
-                pos = ieee80211_ie_build_ht_oper(pos, &sband->ht_cap,
-                                                 &chandef, 0);
-        }
-
-        if (local->hw.queues >= IEEE80211_NUM_ACS) {
+        if (local->hw.queues >= 4) {
                 pos = skb_put(skb, 9);
                 *pos++ = WLAN_EID_VENDOR_SPECIFIC;
                 *pos++ = 7; /* len */
@@ -199,24 +194,8 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
         bss_change |= BSS_CHANGED_BEACON;
         bss_change |= BSS_CHANGED_BEACON_ENABLED;
         bss_change |= BSS_CHANGED_BASIC_RATES;
-        bss_change |= BSS_CHANGED_HT;
         bss_change |= BSS_CHANGED_IBSS;
-
-        /*
-         * In 5 GHz/802.11a, we can always use short slot time.
-         * (IEEE 802.11-2012 18.3.8.7)
-         *
-         * In 2.4GHz, we must always use long slots in IBSS for compatibility
-         * reasons.
-         * (IEEE 802.11-2012 19.4.5)
-         *
-         * HT follows these specifications (IEEE 802.11-2012 20.3.18)
-         */
-        sdata->vif.bss_conf.use_short_slot = chan->band == IEEE80211_BAND_5GHZ;
-        bss_change |= BSS_CHANGED_ERP_SLOT;
-
         sdata->vif.bss_conf.ibss_joined = true;
-        sdata->vif.bss_conf.ibss_creator = creator;
         ieee80211_bss_info_change_notify(sdata, bss_change);
 
         ieee80211_sta_def_wmm_params(sdata, sband->n_bitrates, supp_rates);
@@ -225,10 +204,9 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
         mod_timer(&ifibss->timer,
                   round_jiffies(jiffies + IEEE80211_IBSS_MERGE_INTERVAL));
 
-        bss = cfg80211_inform_bss_frame(local->hw.wiphy, chan,
+        bss = cfg80211_inform_bss_frame(local->hw.wiphy, local->hw.conf.channel,
                                         mgmt, skb->len, 0, GFP_KERNEL);
         cfg80211_put_bss(bss);
-        netif_carrier_on(sdata->dev);
         cfg80211_ibss_joined(sdata->dev, ifibss->bssid, GFP_KERNEL);
 }
 
@@ -269,159 +247,7 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                                   cbss->channel,
                                   basic_rates,
                                   cbss->capability,
-                                  cbss->tsf,
-                                  false);
-}
-
-static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta,
-                                                  bool auth)
-        __acquires(RCU)
-{
-        struct ieee80211_sub_if_data *sdata = sta->sdata;
-        u8 addr[ETH_ALEN];
-
-        memcpy(addr, sta->sta.addr, ETH_ALEN);
-
-        ibss_dbg(sdata, "Adding new IBSS station %pM\n", addr);
-
-        sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
-        sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
-        /* authorize the station only if the network is not RSN protected. If
-         * not wait for the userspace to authorize it */
-        if (!sta->sdata->u.ibss.control_port)
-                sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
-
-        rate_control_rate_init(sta);
-
-        /* If it fails, maybe we raced another insertion? */
-        if (sta_info_insert_rcu(sta))
-                return sta_info_get(sdata, addr);
-        if (auth && !sdata->u.ibss.auth_frame_registrations) {
-                ibss_dbg(sdata,
-                         "TX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=1)\n",
-                         sdata->vif.addr, addr, sdata->u.ibss.bssid);
-                ieee80211_send_auth(sdata, 1, WLAN_AUTH_OPEN, 0, NULL, 0,
-                                    addr, sdata->u.ibss.bssid, NULL, 0, 0);
-        }
-        return sta;
-}
-
-static struct sta_info *
-ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,
-                       const u8 *bssid, const u8 *addr,
-                       u32 supp_rates, bool auth)
-        __acquires(RCU)
-{
-        struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
-        struct ieee80211_local *local = sdata->local;
-        struct sta_info *sta;
-        struct ieee80211_chanctx_conf *chanctx_conf;
-        int band;
-
-        /*
-         * XXX: Consider removing the least recently used entry and
-         *      allow new one to be added.
-         */
-        if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
-                net_info_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
-                                    sdata->name, addr);
-                rcu_read_lock();
-                return NULL;
-        }
-
-        if (ifibss->state == IEEE80211_IBSS_MLME_SEARCH) {
-                rcu_read_lock();
-                return NULL;
-        }
-
-        if (!ether_addr_equal(bssid, sdata->u.ibss.bssid)) {
-                rcu_read_lock();
-                return NULL;
-        }
-
-        rcu_read_lock();
-        chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
-        if (WARN_ON_ONCE(!chanctx_conf))
-                return NULL;
-        band = chanctx_conf->def.chan->band;
-        rcu_read_unlock();
-
-        sta = sta_info_alloc(sdata, addr, GFP_KERNEL);
-        if (!sta) {
-                rcu_read_lock();
-                return NULL;
-        }
-
-        sta->last_rx = jiffies;
-
-        /* make sure mandatory rates are always added */
-        sta->sta.supp_rates[band] = supp_rates |
-                        ieee80211_mandatory_rates(local, band);
-
-        return ieee80211_ibss_finish_sta(sta, auth);
-}
-
-static void ieee80211_rx_mgmt_deauth_ibss(struct ieee80211_sub_if_data *sdata,
-                                          struct ieee80211_mgmt *mgmt,
-                                          size_t len)
-{
-        u16 reason = le16_to_cpu(mgmt->u.deauth.reason_code);
-
-        if (len < IEEE80211_DEAUTH_FRAME_LEN)
-                return;
-
-        ibss_dbg(sdata, "RX DeAuth SA=%pM DA=%pM BSSID=%pM (reason: %d)\n",
-                 mgmt->sa, mgmt->da, mgmt->bssid, reason);
-        sta_info_destroy_addr(sdata, mgmt->sa);
-}
-
-static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
-                                        struct ieee80211_mgmt *mgmt,
-                                        size_t len)
-{
-        u16 auth_alg, auth_transaction;
-        struct sta_info *sta;
-        u8 deauth_frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
-
-        lockdep_assert_held(&sdata->u.ibss.mtx);
-
-        if (len < 24 + 6)
-                return;
-
-        auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);
-        auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);
-
-        ibss_dbg(sdata,
-                 "RX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=%d)\n",
-                 mgmt->sa, mgmt->da, mgmt->bssid, auth_transaction);
-
-        if (auth_alg != WLAN_AUTH_OPEN || auth_transaction != 1)
-                return;
-
-        sta_info_destroy_addr(sdata, mgmt->sa);
-        sta = ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, 0, false);
-        rcu_read_unlock();
-
-        /*
-         * if we have any problem in allocating the new station, we reply with a
-         * DEAUTH frame to tell the other end that we had a problem
-         */
-        if (!sta) {
-                ieee80211_send_deauth_disassoc(sdata, sdata->u.ibss.bssid,
-                                               IEEE80211_STYPE_DEAUTH,
-                                               WLAN_REASON_UNSPECIFIED, true,
-                                               deauth_frame_buf);
-                return;
-        }
-
-        /*
-         * IEEE 802.11 standard does not require authentication in IBSS
-         * networks and most implementations do not seem to use it.
-         * However, try to reply to authentication attempts if someone
-         * has actually implemented this.
-         */
-        ieee80211_send_auth(sdata, 2, WLAN_AUTH_OPEN, 0, NULL, 0,
-                            mgmt->sa, sdata->u.ibss.bssid, NULL, 0, 0);
+                                  cbss->tsf);
 }
 
 static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
@@ -440,8 +266,6 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
         u64 beacon_timestamp, rx_timestamp;
         u32 supp_rates = 0;
         enum ieee80211_band band = rx_status->band;
-        struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
-        bool rates_updated = false;
 
         if (elems->ds_params && elems->ds_params_len == 1)
                 freq = ieee80211_channel_to_frequency(elems->ds_params[0],
@@ -455,14 +279,14 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                 return;
 
         if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
-            ether_addr_equal(mgmt->bssid, sdata->u.ibss.bssid)) {
+            memcmp(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0) {
 
                 rcu_read_lock();
                 sta = sta_info_get(sdata, mgmt->sa);
 
                 if (elems->supp_rates) {
                         supp_rates = ieee80211_sta_get_rates(local, elems,
-                                                             band, NULL);
+                                                             band);
                         if (sta) {
                                 u32 prev_rates;
 
@@ -472,59 +296,25 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                                         ieee80211_mandatory_rates(local, band);
 
                                 if (sta->sta.supp_rates[band] != prev_rates) {
-                                        ibss_dbg(sdata,
-                                                 "updated supp_rates set for %pM based on beacon/probe_resp (0x%x -> 0x%x)\n",
-                                                 sta->sta.addr, prev_rates,
-                                                 sta->sta.supp_rates[band]);
-                                        rates_updated = true;
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+                                        printk(KERN_DEBUG
+                                                "%s: updated supp_rates set "
+                                                "for %pM based on beacon"
+                                                "/probe_resp (0x%x -> 0x%x)\n",
+                                                sdata->name, sta->sta.addr,
+                                                prev_rates,
+                                                sta->sta.supp_rates[band]);
+#endif
+                                        rate_control_rate_init(sta);
                                 }
-                        } else {
-                                rcu_read_unlock();
+                        } else
                                 sta = ieee80211_ibss_add_sta(sdata, mgmt->bssid,
-                                                mgmt->sa, supp_rates, true);
-                        }
+                                                mgmt->sa, supp_rates,
+                                                GFP_ATOMIC);
                 }
 
                 if (sta && elems->wmm_info)
-                        set_sta_flag(sta, WLAN_STA_WME);
-
-                if (sta && elems->ht_operation && elems->ht_cap_elem &&
-                    sdata->u.ibss.channel_type != NL80211_CHAN_NO_HT) {
-                        /* we both use HT */
-                        struct ieee80211_sta_ht_cap sta_ht_cap_new;
-                        struct cfg80211_chan_def chandef;
-
-                        ieee80211_ht_oper_to_chandef(channel,
-                                                     elems->ht_operation,
-                                                     &chandef);
-
-                        ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
-                                                          elems->ht_cap_elem,
-                                                          &sta_ht_cap_new);
-
-                        /*
-                         * fall back to HT20 if we don't use or use
-                         * the other extension channel
-                         */
-                        if (chandef.width != NL80211_CHAN_WIDTH_40 ||
-                            cfg80211_get_chandef_type(&chandef) !=
-                                                sdata->u.ibss.channel_type)
-                                sta_ht_cap_new.cap &=
-                                        ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
-
-                        if (memcmp(&sta->sta.ht_cap, &sta_ht_cap_new,
-                                   sizeof(sta_ht_cap_new))) {
-                                memcpy(&sta->sta.ht_cap, &sta_ht_cap_new,
-                                       sizeof(sta_ht_cap_new));
-                                rates_updated = true;
-                        }
-                }
-
-                if (sta && rates_updated) {
-                        drv_sta_rc_update(local, sdata, &sta->sta,
-                                          IEEE80211_RC_SUPP_RATES_CHANGED);
-                        rate_control_rate_init(sta);
-                }
+                        set_sta_flags(sta, WLAN_STA_WME);
 
                 rcu_read_unlock();
         }
@@ -550,8 +340,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                 goto put_bss;
 
         /* different channel */
-        if (sdata->u.ibss.fixed_channel &&
-            sdata->u.ibss.channel != cbss->channel)
+        if (cbss->channel != local->oper_channel)
                 goto put_bss;
 
         /* different SSID */
@@ -561,94 +350,120 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                 goto put_bss;
 
         /* same BSSID */
-        if (ether_addr_equal(cbss->bssid, sdata->u.ibss.bssid))
+        if (memcmp(cbss->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0)
                 goto put_bss;
 
-        if (ieee80211_have_rx_timestamp(rx_status)) {
-                /* time when timestamp field was received */
-                rx_timestamp =
-                        ieee80211_calculate_rx_timestamp(local, rx_status,
-                                                         len + FCS_LEN, 24);
+        if (rx_status->flag & RX_FLAG_MACTIME_MPDU) {
+                /*
+                 * For correct IBSS merging we need mactime; since mactime is
+                 * defined as the time the first data symbol of the frame hits
+                 * the PHY, and the timestamp of the beacon is defined as "the
+                 * time that the data symbol containing the first bit of the
+                 * timestamp is transmitted to the PHY plus the transmitting
+                 * STA's delays through its local PHY from the MAC-PHY
+                 * interface to its interface with the WM" (802.11 11.1.2)
+                 * - equals the time this bit arrives at the receiver - we have
+                 * to take into account the offset between the two.
+                 *
+                 * E.g. at 1 MBit that means mactime is 192 usec earlier
+                 * (=24 bytes * 8 usecs/byte) than the beacon timestamp.
+                 */
+                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 {
                 /*
                  * second best option: get current TSF
                  * (will return -1 if not supported)
                  */
-                rx_timestamp = drv_get_tsf(local, sdata);
+                rx_timestamp = drv_get_tsf(local);
         }
 
-        ibss_dbg(sdata,
-                 "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),
-                 jiffies);
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+        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),
+               jiffies);
+#endif
 
         if (beacon_timestamp > rx_timestamp) {
-                ibss_dbg(sdata,
-                         "beacon TSF higher than local TSF - IBSS merge with BSSID %pM\n",
-                         mgmt->bssid);
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+                printk(KERN_DEBUG "%s: beacon TSF higher than "
+                       "local TSF - IBSS merge with BSSID %pM\n",
+                       sdata->name, mgmt->bssid);
+#endif
                 ieee80211_sta_join_ibss(sdata, bss);
-                supp_rates = ieee80211_sta_get_rates(local, elems, band, NULL);
+                supp_rates = ieee80211_sta_get_rates(local, elems, band);
                 ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa,
-                                       supp_rates, true);
-                rcu_read_unlock();
+                                       supp_rates, GFP_KERNEL);
         }
 
  put_bss:
         ieee80211_rx_bss_put(local, bss);
 }
 
-void ieee80211_ibss_rx_no_sta(struct ieee80211_sub_if_data *sdata,
-                              const u8 *bssid, const u8 *addr,
-                              u32 supp_rates)
+/*
+ * 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, u32 supp_rates,
+                                        gfp_t gfp)
 {
         struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
         struct ieee80211_local *local = sdata->local;
         struct sta_info *sta;
-        struct ieee80211_chanctx_conf *chanctx_conf;
-        int band;
+        int band = local->hw.conf.channel->band;
 
         /*
          * XXX: Consider removing the least recently used entry and
          *      allow new one to be added.
          */
         if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
-                net_info_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
-                                    sdata->name, addr);
-                return;
+                if (net_ratelimit())
+                        printk(KERN_DEBUG "%s: No room for a new IBSS STA entry %pM\n",
+                               sdata->name, addr);
+                return NULL;
         }
 
         if (ifibss->state == IEEE80211_IBSS_MLME_SEARCH)
-                return;
+                return NULL;
 
-        if (!ether_addr_equal(bssid, sdata->u.ibss.bssid))
-                return;
+        if (compare_ether_addr(bssid, sdata->u.ibss.bssid))
+                return NULL;
 
-        rcu_read_lock();
-        chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
-        if (WARN_ON_ONCE(!chanctx_conf)) {
-                rcu_read_unlock();
-                return;
-        }
-        band = chanctx_conf->def.chan->band;
-        rcu_read_unlock();
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+        wiphy_debug(local->hw.wiphy, "Adding new IBSS station %pM (dev=%s)\n",
+                    addr, sdata->name);
+#endif
 
-        sta = sta_info_alloc(sdata, addr, GFP_ATOMIC);
+        sta = sta_info_alloc(sdata, addr, gfp);
         if (!sta)
-                return;
+                return NULL;
 
         sta->last_rx = jiffies;
+        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);
 
-        spin_lock(&ifibss->incomplete_lock);
-        list_add(&sta->list, &ifibss->incomplete_stations);
-        spin_unlock(&ifibss->incomplete_lock);
-        ieee80211_queue_work(&local->hw, &sdata->work);
+        rate_control_rate_init(sta);
+
+        /* If it fails, maybe we raced another insertion? */
+        if (sta_info_insert(sta))
+                return sta_info_get(sdata, addr);
+        return sta;
 }
 
 static int ieee80211_sta_active_ibss(struct ieee80211_sub_if_data *sdata)
@@ -700,11 +515,12 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
         if (ifibss->fixed_channel)
                 return;
 
-        sdata_info(sdata,
-                   "No active IBSS STAs - trying to scan for other IBSS networks with same SSID (merge)\n");
+        printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other "
+               "IBSS networks with same SSID (merge)\n", sdata->name);
 
-        ieee80211_request_ibss_scan(sdata, ifibss->ssid, ifibss->ssid_len,
-                                    NULL);
+        ieee80211_request_internal_scan(sdata,
+                        ifibss->ssid, ifibss->ssid_len,
+                        ifibss->fixed_channel ? ifibss->channel : NULL);
 }
 
 static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
@@ -729,7 +545,8 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
                 bssid[0] |= 0x02;
         }
 
-        sdata_info(sdata, "Creating new IBSS network, BSSID %pM\n", bssid);
+        printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID %pM\n",
+               sdata->name, bssid);
 
         capability = WLAN_CAPABILITY_IBSS;
 
@@ -740,7 +557,7 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
 
         __ieee80211_sta_join_ibss(sdata, bssid, sdata->vif.bss_conf.beacon_int,
                                   ifibss->channel, ifibss->basic_rates,
-                                  capability, 0, true);
+                                  capability, 0);
 }
 
 /*
@@ -760,7 +577,10 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
         lockdep_assert_held(&ifibss->mtx);
 
         active_ibss = ieee80211_sta_active_ibss(sdata);
-        ibss_dbg(sdata, "sta_find_ibss (active_ibss=%d)\n", active_ibss);
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+        printk(KERN_DEBUG "%s: sta_find_ibss (active_ibss=%d)\n",
+               sdata->name, active_ibss);
+#endif /* CONFIG_MAC80211_IBSS_DEBUG */
 
         if (active_ibss)
                 return;
@@ -783,33 +603,50 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
                 struct ieee80211_bss *bss;
 
                 bss = (void *)cbss->priv;
-                ibss_dbg(sdata,
-                         "sta_find_ibss: selected %pM current %pM\n",
-                         cbss->bssid, ifibss->bssid);
-                sdata_info(sdata,
-                           "Selected IBSS BSSID %pM based on configured SSID\n",
-                           cbss->bssid);
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+                printk(KERN_DEBUG "   sta_find_ibss: selected %pM current "
+                       "%pM\n", cbss->bssid, ifibss->bssid);
+#endif /* CONFIG_MAC80211_IBSS_DEBUG */
+
+                printk(KERN_DEBUG "%s: Selected IBSS BSSID %pM"
+                       " based on configured SSID\n",
+                       sdata->name, cbss->bssid);
 
                 ieee80211_sta_join_ibss(sdata, bss);
                 ieee80211_rx_bss_put(local, bss);
                 return;
         }
 
-        ibss_dbg(sdata, "sta_find_ibss: did not try to join ibss\n");
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+        printk(KERN_DEBUG "   did not try to join ibss\n");
+#endif /* CONFIG_MAC80211_IBSS_DEBUG */
 
         /* Selected IBSS not found in current scan results - try to scan */
         if (time_after(jiffies, ifibss->last_scan_completed +
                                         IEEE80211_SCAN_INTERVAL)) {
-                sdata_info(sdata, "Trigger new scan to find an IBSS to join\n");
+                printk(KERN_DEBUG "%s: Trigger new scan to find an IBSS to "
+                       "join\n", sdata->name);
 
-                ieee80211_request_ibss_scan(sdata, ifibss->ssid,
-                                            ifibss->ssid_len, chan);
+                ieee80211_request_internal_scan(sdata,
+                                ifibss->ssid, ifibss->ssid_len,
+                                ifibss->fixed_channel ? ifibss->channel : NULL);
         } else {
                 int interval = IEEE80211_SCAN_INTERVAL;
 
                 if (time_after(jiffies, ifibss->ibss_join_req +
-                               IEEE80211_IBSS_JOIN_TIMEOUT))
-                        ieee80211_sta_create_ibss(sdata);
+                               IEEE80211_IBSS_JOIN_TIMEOUT)) {
+                        if (!(local->oper_channel->flags & IEEE80211_CHAN_NO_IBSS)) {
+                                ieee80211_sta_create_ibss(sdata);
+                                return;
+                        }
+                        printk(KERN_DEBUG "%s: IBSS not allowed on"
+                               " %d MHz\n", sdata->name,
+                               local->hw.conf.channel->center_freq);
+
+                        /* No IBSS found - decrease scan interval and continue
+                         * scanning. */
+                        interval = IEEE80211_SCAN_INTERVAL_SLOW;
+                }
 
                 mod_timer(&ifibss->timer,
                           round_jiffies(jiffies + interval));
@@ -839,23 +676,29 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
 
         tx_last_beacon = drv_tx_last_beacon(local);
 
-        ibss_dbg(sdata,
-                 "RX ProbeReq SA=%pM DA=%pM BSSID=%pM (tx_last_beacon=%d)\n",
-                 mgmt->sa, mgmt->da, mgmt->bssid, tx_last_beacon);
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+        printk(KERN_DEBUG "%s: RX ProbeReq SA=%pM DA=%pM BSSID=%pM"
+               " (tx_last_beacon=%d)\n",
+               sdata->name, mgmt->sa, mgmt->da,
+               mgmt->bssid, tx_last_beacon);
+#endif /* CONFIG_MAC80211_IBSS_DEBUG */
 
         if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da))
                 return;
 
-        if (!ether_addr_equal(mgmt->bssid, ifibss->bssid) &&
-            !is_broadcast_ether_addr(mgmt->bssid))
+        if (memcmp(mgmt->bssid, ifibss->bssid, ETH_ALEN) != 0 &&
+            memcmp(mgmt->bssid, "\xff\xff\xff\xff\xff\xff", ETH_ALEN) != 0)
                 return;
 
         end = ((u8 *) mgmt) + len;
         pos = mgmt->u.probe_req.variable;
         if (pos[0] != WLAN_EID_SSID ||
             pos + 2 + pos[1] > end) {
-                ibss_dbg(sdata, "Invalid SSID IE in ProbeReq from %pM\n",
-                         mgmt->sa);
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+                printk(KERN_DEBUG "%s: Invalid SSID IE in ProbeReq "
+                       "from %pM\n",
+                       sdata->name, mgmt->sa);
+#endif
                 return;
         }
         if (pos[1] != 0 &&
@@ -872,7 +715,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);
-        ibss_dbg(sdata, "Sending ProbeResp to %pM\n", resp->da);
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+        printk(KERN_DEBUG "%s: Sending ProbeResp to %pM\n",
+               sdata->name, resp->da);
+#endif /* CONFIG_MAC80211_IBSS_DEBUG */
         IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
         ieee80211_tx_skb(sdata, skb);
 }
@@ -885,6 +731,9 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
         size_t baselen;
         struct ieee802_11_elems elems;
 
+        if (memcmp(mgmt->da, sdata->vif.addr, ETH_ALEN))
+                return; /* ignore ProbeResp to foreign address */
+
         baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
         if (baselen > len)
                 return;
@@ -944,9 +793,6 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
         case IEEE80211_STYPE_AUTH:
                 ieee80211_rx_mgmt_auth_ibss(sdata, mgmt, skb->len);
                 break;
-        case IEEE80211_STYPE_DEAUTH:
-                ieee80211_rx_mgmt_deauth_ibss(sdata, mgmt, skb->len);
-                break;
         }
 
  mgmt_out:
@@ -956,7 +802,6 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
 void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
-        struct sta_info *sta;
 
         mutex_lock(&ifibss->mtx);
 
@@ -968,19 +813,6 @@ void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata)
         if (!ifibss->ssid_len)
                 goto out;
 
-        spin_lock_bh(&ifibss->incomplete_lock);
-        while (!list_empty(&ifibss->incomplete_stations)) {
-                sta = list_first_entry(&ifibss->incomplete_stations,
-                                       struct sta_info, list);
-                list_del(&sta->list);
-                spin_unlock_bh(&ifibss->incomplete_lock);
-
-                ieee80211_ibss_finish_sta(sta, true);
-                rcu_read_unlock();
-                spin_lock_bh(&ifibss->incomplete_lock);
-        }
-        spin_unlock_bh(&ifibss->incomplete_lock);
-
         switch (ifibss->state) {
         case IEEE80211_IBSS_MLME_SEARCH:
                 ieee80211_sta_find_ibss(sdata);
@@ -1039,8 +871,6 @@ void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata)
         setup_timer(&ifibss->timer, ieee80211_ibss_timer,
                     (unsigned long) sdata);
         mutex_init(&ifibss->mtx);
-        INIT_LIST_HEAD(&ifibss->incomplete_stations);
-        spin_lock_init(&ifibss->incomplete_lock);
 }
 
 /* scan finished notification */
@@ -1064,18 +894,12 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
                         struct cfg80211_ibss_params *params)
 {
         struct sk_buff *skb;
-        u32 changed = 0;
 
         skb = dev_alloc_skb(sdata->local->hw.extra_tx_headroom +
-                            sizeof(struct ieee80211_hdr_3addr) +
-                            12 /* struct ieee80211_mgmt.u.beacon */ +
-                            2 + IEEE80211_MAX_SSID_LEN /* max SSID */ +
-                            2 + 8 /* max Supported Rates */ +
-                            3 /* max DS params */ +
-                            4 /* IBSS params */ +
-                            2 + (IEEE80211_MAX_SUPP_RATES - 8) +
-                            2 + sizeof(struct ieee80211_ht_cap) +
-                            2 + sizeof(struct ieee80211_ht_operation) +
+                            36 /* bitrates */ +
+                            34 /* SSID */ +
+                            3  /* DS params */ +
+                            4  /* IBSS params */ +
                             params->ie_len);
         if (!skb)
                 return -ENOMEM;
@@ -1089,18 +913,22 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
                 sdata->u.ibss.fixed_bssid = false;
 
         sdata->u.ibss.privacy = params->privacy;
-        sdata->u.ibss.control_port = params->control_port;
         sdata->u.ibss.basic_rates = params->basic_rates;
         memcpy(sdata->vif.bss_conf.mcast_rate, params->mcast_rate,
                sizeof(params->mcast_rate));
 
         sdata->vif.bss_conf.beacon_int = params->beacon_interval;
 
-        sdata->u.ibss.channel = params->chandef.chan;
-        sdata->u.ibss.channel_type =
-                cfg80211_get_chandef_type(&params->chandef);
+        sdata->u.ibss.channel = params->channel;
         sdata->u.ibss.fixed_channel = params->channel_fixed;
 
+        /* fix ourselves to that channel now already */
+        if (params->channel_fixed) {
+                sdata->local->oper_channel = params->channel;
+                WARN_ON(!ieee80211_set_channel_type(sdata->local, sdata,
+                                                    NL80211_CHAN_NO_HT));
+        }
+
         if (params->ie) {
                 sdata->u.ibss.ie = kmemdup(params->ie, params->ie_len,
                                            GFP_KERNEL);
@@ -1112,7 +940,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
         sdata->u.ibss.state = IEEE80211_IBSS_MLME_SEARCH;
         sdata->u.ibss.ibss_join_req = jiffies;
 
-        memcpy(sdata->u.ibss.ssid, params->ssid, params->ssid_len);
+        memcpy(sdata->u.ibss.ssid, params->ssid, IEEE80211_MAX_SSID_LEN);
         sdata->u.ibss.ssid_len = params->ssid_len;
 
         mutex_unlock(&sdata->u.ibss.mtx);
@@ -1121,26 +949,6 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
         ieee80211_recalc_idle(sdata->local);
         mutex_unlock(&sdata->local->mtx);
 
-        /*
-         * 802.11n-2009 9.13.3.1: In an IBSS, the HT Protection field is
-         * reserved, but an HT STA shall protect HT transmissions as though
-         * the HT Protection field were set to non-HT mixed mode.
-         *
-         * In an IBSS, the RIFS Mode field of the HT Operation element is
-         * also reserved, but an HT STA shall operate as though this field
-         * were set to 1.
-         */
-
-        sdata->vif.bss_conf.ht_operation_mode |=
-                  IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED
-                | IEEE80211_HT_PARAM_RIFS_MODE;
-
-        changed |= BSS_CHANGED_HT;
-        ieee80211_bss_info_change_notify(sdata, changed);
-
-        sdata->smps_mode = IEEE80211_SMPS_OFF;
-        sdata->needed_rx_chains = sdata->local->rx_chains;
-
         ieee80211_queue_work(&sdata->local->hw, &sdata->work);
 
         return 0;
@@ -1154,10 +962,13 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
         struct cfg80211_bss *cbss;
         u16 capability;
         int active_ibss;
-        struct sta_info *sta;
 
         mutex_lock(&sdata->u.ibss.mtx);
 
+        sdata->u.ibss.state = IEEE80211_IBSS_MLME_SEARCH;
+        memset(sdata->u.ibss.bssid, 0, ETH_ALEN);
+        sdata->u.ibss.ssid_len = 0;
+
         active_ibss = ieee80211_sta_active_ibss(sdata);
 
         if (!active_ibss && !is_zero_ether_addr(ifibss->bssid)) {
@@ -1178,33 +989,14 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
                 }
         }
 
-        ifibss->state = IEEE80211_IBSS_MLME_SEARCH;
-        memset(ifibss->bssid, 0, ETH_ALEN);
-        ifibss->ssid_len = 0;
-
         sta_info_flush(sdata->local, sdata);
 
-        spin_lock_bh(&ifibss->incomplete_lock);
-        while (!list_empty(&ifibss->incomplete_stations)) {
-                sta = list_first_entry(&ifibss->incomplete_stations,
-                                       struct sta_info, list);
-                list_del(&sta->list);
-                spin_unlock_bh(&ifibss->incomplete_lock);
-
-                sta_info_free(local, sta);
-                spin_lock_bh(&ifibss->incomplete_lock);
-        }
-        spin_unlock_bh(&ifibss->incomplete_lock);
-
-        netif_carrier_off(sdata->dev);
-
         /* remove beacon */
         kfree(sdata->u.ibss.ie);
         skb = rcu_dereference_protected(sdata->u.ibss.presp,
                                         lockdep_is_held(&sdata->u.ibss.mtx));
-        RCU_INIT_POINTER(sdata->u.ibss.presp, NULL);
+        rcu_assign_pointer(sdata->u.ibss.presp, NULL);
         sdata->vif.bss_conf.ibss_joined = false;
-        sdata->vif.bss_conf.ibss_creator = false;
         ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED |
                                                 BSS_CHANGED_IBSS);
         synchronize_rcu();