1 files changed, 208 insertions, 176 deletions

diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index d0273ccbdbae..2628222a5085 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -74,7 +74,7 @@
 static void ieee80211_send_probe_req(struct net_device *dev, u8 *dst,
                                      u8 *ssid, size_t ssid_len);
 static struct ieee80211_sta_bss *
-ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid, int channel,
+ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid, int freq,
                      u8 *ssid, u8 ssid_len);
 static void ieee80211_rx_bss_put(struct net_device *dev,
                                  struct ieee80211_sta_bss *bss);
@@ -466,7 +466,7 @@ static void ieee80211_set_associated(struct net_device *dev,
                         return;
 
                 bss = ieee80211_rx_bss_get(dev, ifsta->bssid,
-                                           local->hw.conf.channel,
+                                           local->hw.conf.channel->center_freq,
                                            ifsta->ssid, ifsta->ssid_len);
                 if (bss) {
                         if (bss->has_erp_value)
@@ -593,7 +593,6 @@ static void ieee80211_send_assoc(struct net_device *dev,
                                  struct ieee80211_if_sta *ifsta)
 {
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct ieee80211_hw_mode *mode;
         struct sk_buff *skb;
         struct ieee80211_mgmt *mgmt;
         u8 *pos, *ies;
@@ -601,6 +600,7 @@ static void ieee80211_send_assoc(struct net_device *dev,
         u16 capab;
         struct ieee80211_sta_bss *bss;
         int wmm = 0;
+        struct ieee80211_supported_band *sband;
 
         skb = dev_alloc_skb(local->hw.extra_tx_headroom +
                             sizeof(*mgmt) + 200 + ifsta->extra_ie_len +
@@ -612,13 +612,19 @@ static void ieee80211_send_assoc(struct net_device *dev,
         }
         skb_reserve(skb, local->hw.extra_tx_headroom);
 
-        mode = local->oper_hw_mode;
+        sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
+
         capab = ifsta->capab;
-        if (mode->mode == MODE_IEEE80211G) {
-                capab |= WLAN_CAPABILITY_SHORT_SLOT_TIME |
-                        WLAN_CAPABILITY_SHORT_PREAMBLE;
+
+        if (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ) {
+                if (!(local->hw.flags & IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE))
+                        capab |= WLAN_CAPABILITY_SHORT_SLOT_TIME;
+                if (!(local->hw.flags & IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE))
+                        capab |= WLAN_CAPABILITY_SHORT_PREAMBLE;
         }
-        bss = ieee80211_rx_bss_get(dev, ifsta->bssid, local->hw.conf.channel,
+
+        bss = ieee80211_rx_bss_get(dev, ifsta->bssid,
+                                   local->hw.conf.channel->center_freq,
                                    ifsta->ssid, ifsta->ssid_len);
         if (bss) {
                 if (bss->capability & WLAN_CAPABILITY_PRIVACY)
@@ -657,23 +663,23 @@ static void ieee80211_send_assoc(struct net_device *dev,
         *pos++ = ifsta->ssid_len;
         memcpy(pos, ifsta->ssid, ifsta->ssid_len);
 
-        len = mode->num_rates;
+        len = sband->n_bitrates;
         if (len > 8)
                 len = 8;
         pos = skb_put(skb, len + 2);
         *pos++ = WLAN_EID_SUPP_RATES;
         *pos++ = len;
         for (i = 0; i < len; i++) {
-                int rate = mode->rates[i].rate;
+                int rate = sband->bitrates[i].bitrate;
                 *pos++ = (u8) (rate / 5);
         }
 
-        if (mode->num_rates > len) {
-                pos = skb_put(skb, mode->num_rates - len + 2);
+        if (sband->n_bitrates > len) {
+                pos = skb_put(skb, sband->n_bitrates - len + 2);
                 *pos++ = WLAN_EID_EXT_SUPP_RATES;
-                *pos++ = mode->num_rates - len;
-                for (i = len; i < mode->num_rates; i++) {
-                        int rate = mode->rates[i].rate;
+                *pos++ = sband->n_bitrates - len;
+                for (i = len; i < sband->n_bitrates; i++) {
+                        int rate = sband->bitrates[i].bitrate;
                         *pos++ = (u8) (rate / 5);
                 }
         }
@@ -696,17 +702,18 @@ static void ieee80211_send_assoc(struct net_device *dev,
                 *pos++ = 0;
         }
         /* wmm support is a must to HT */
-        if (wmm && mode->ht_info.ht_supported) {
-                __le16 tmp = cpu_to_le16(mode->ht_info.cap);
+        if (wmm && sband->ht_info.ht_supported) {
+                __le16 tmp = cpu_to_le16(sband->ht_info.cap);
                 pos = skb_put(skb, sizeof(struct ieee80211_ht_cap)+2);
                 *pos++ = WLAN_EID_HT_CAPABILITY;
                 *pos++ = sizeof(struct ieee80211_ht_cap);
                 memset(pos, 0, sizeof(struct ieee80211_ht_cap));
                 memcpy(pos, &tmp, sizeof(u16));
                 pos += sizeof(u16);
-                *pos++ = (mode->ht_info.ampdu_factor |
-                                (mode->ht_info.ampdu_density << 2));
-                memcpy(pos, mode->ht_info.supp_mcs_set, 16);
+                /* 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);
         }
 
         kfree(ifsta->assocreq_ies);
@@ -789,7 +796,8 @@ static int ieee80211_privacy_mismatch(struct net_device *dev,
         if (!ifsta || (ifsta->flags & IEEE80211_STA_MIXED_CELL))
                 return 0;
 
-        bss = ieee80211_rx_bss_get(dev, ifsta->bssid, local->hw.conf.channel,
+        bss = ieee80211_rx_bss_get(dev, ifsta->bssid,
+                                   local->hw.conf.channel->center_freq,
                                    ifsta->ssid, ifsta->ssid_len);
         if (!bss)
                 return 0;
@@ -899,7 +907,7 @@ static void ieee80211_send_probe_req(struct net_device *dev, u8 *dst,
                                      u8 *ssid, size_t ssid_len)
 {
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct ieee80211_hw_mode *mode;
+        struct ieee80211_supported_band *sband;
         struct sk_buff *skb;
         struct ieee80211_mgmt *mgmt;
         u8 *pos, *supp_rates, *esupp_rates = NULL;
@@ -933,11 +941,10 @@ static void ieee80211_send_probe_req(struct net_device *dev, u8 *dst,
         supp_rates = skb_put(skb, 2);
         supp_rates[0] = WLAN_EID_SUPP_RATES;
         supp_rates[1] = 0;
-        mode = local->oper_hw_mode;
-        for (i = 0; i < mode->num_rates; i++) {
-                struct ieee80211_rate *rate = &mode->rates[i];
-                if (!(rate->flags & IEEE80211_RATE_SUPPORTED))
-                        continue;
+        sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
+
+        for (i = 0; i < sband->n_bitrates; i++) {
+                struct ieee80211_rate *rate = &sband->bitrates[i];
                 if (esupp_rates) {
                         pos = skb_put(skb, 1);
                         esupp_rates[1]++;
@@ -950,7 +957,7 @@ static void ieee80211_send_probe_req(struct net_device *dev, u8 *dst,
                         pos = skb_put(skb, 1);
                         supp_rates[1]++;
                 }
-                *pos = rate->rate / 5;
+                *pos = rate->bitrate / 5;
         }
 
         ieee80211_sta_tx(dev, skb, 0);
@@ -1146,9 +1153,11 @@ static void ieee80211_sta_process_addba_request(struct net_device *dev,
         }
         /* determine default buffer size */
         if (buf_size == 0) {
-                struct ieee80211_hw_mode *mode = conf->mode;
+                struct ieee80211_supported_band *sband;
+
+                sband = local->hw.wiphy->bands[conf->channel->band];
                 buf_size = IEEE80211_MIN_AMPDU_BUF;
-                buf_size = buf_size << mode->ht_info.ampdu_factor;
+                buf_size = buf_size << sband->ht_info.ampdu_factor;
         }
 
         tid_agg_rx = &sta->ampdu_mlme.tid_rx[tid];
@@ -1718,15 +1727,16 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
 {
         struct ieee80211_local *local = sdata->local;
         struct net_device *dev = sdata->dev;
-        struct ieee80211_hw_mode *mode;
+        struct ieee80211_supported_band *sband;
         struct sta_info *sta;
-        u32 rates;
+        u64 rates, basic_rates;
         u16 capab_info, status_code, aid;
         struct ieee802_11_elems elems;
         struct ieee80211_bss_conf *bss_conf = &sdata->bss_conf;
         u8 *pos;
         int i, j;
         DECLARE_MAC_BUF(mac);
+        bool have_higher_than_11mbit = false;
 
         /* AssocResp and ReassocResp have identical structure, so process both
          * of them in this function. */
@@ -1796,10 +1806,6 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
         if (ifsta->assocresp_ies)
                 memcpy(ifsta->assocresp_ies, pos, ifsta->assocresp_ies_len);
 
-        /* set AID, ieee80211_set_associated() will tell the driver */
-        bss_conf->aid = aid;
-        ieee80211_set_associated(dev, ifsta, 1);
-
         /* Add STA entry for the AP */
         sta = sta_info_get(local, ifsta->bssid);
         if (!sta) {
@@ -1811,7 +1817,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
                         return;
                 }
                 bss = ieee80211_rx_bss_get(dev, ifsta->bssid,
-                                           local->hw.conf.channel,
+                                           local->hw.conf.channel->center_freq,
                                            ifsta->ssid, ifsta->ssid_len);
                 if (bss) {
                         sta->last_rssi = bss->rssi;
@@ -1825,20 +1831,46 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
         sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC | WLAN_STA_ASSOC_AP;
 
         rates = 0;
-        mode = local->oper_hw_mode;
+        basic_rates = 0;
+        sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
+
         for (i = 0; i < elems.supp_rates_len; i++) {
                 int rate = (elems.supp_rates[i] & 0x7f) * 5;
-                for (j = 0; j < mode->num_rates; j++)
-                        if (mode->rates[j].rate == rate)
+
+                if (rate > 110)
+                        have_higher_than_11mbit = true;
+
+                for (j = 0; j < sband->n_bitrates; j++) {
+                        if (sband->bitrates[j].bitrate == rate)
                                 rates |= BIT(j);
+                        if (elems.supp_rates[i] & 0x80)
+                                basic_rates |= BIT(j);
+                }
         }
+
         for (i = 0; i < elems.ext_supp_rates_len; i++) {
                 int rate = (elems.ext_supp_rates[i] & 0x7f) * 5;
-                for (j = 0; j < mode->num_rates; j++)
-                        if (mode->rates[j].rate == rate)
+
+                if (rate > 110)
+                        have_higher_than_11mbit = true;
+
+                for (j = 0; j < sband->n_bitrates; j++) {
+                        if (sband->bitrates[j].bitrate == rate)
                                 rates |= BIT(j);
+                        if (elems.ext_supp_rates[i] & 0x80)
+                                basic_rates |= BIT(j);
+                }
         }
-        sta->supp_rates = rates;
+
+        sta->supp_rates[local->hw.conf.channel->band] = rates;
+        sdata->basic_rates = basic_rates;
+
+        /* cf. IEEE 802.11 9.2.12 */
+        if (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ &&
+            have_higher_than_11mbit)
+                sdata->flags |= IEEE80211_SDATA_OPERATING_GMODE;
+        else
+                sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE;
 
         if (elems.ht_cap_elem && elems.ht_info_elem && elems.wmm_param &&
             local->ops->conf_ht) {
@@ -1861,6 +1893,9 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
                                          elems.wmm_param_len);
         }
 
+        /* set AID, ieee80211_set_associated() will tell the driver */
+        bss_conf->aid = aid;
+        ieee80211_set_associated(dev, ifsta, 1);
 
         sta_info_put(sta);
 
@@ -1901,7 +1936,7 @@ static void __ieee80211_rx_bss_hash_del(struct net_device *dev,
 
 
 static struct ieee80211_sta_bss *
-ieee80211_rx_bss_add(struct net_device *dev, u8 *bssid, int channel,
+ieee80211_rx_bss_add(struct net_device *dev, u8 *bssid, int freq,
                      u8 *ssid, u8 ssid_len)
 {
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
@@ -1913,7 +1948,7 @@ ieee80211_rx_bss_add(struct net_device *dev, u8 *bssid, int channel,
         atomic_inc(&bss->users);
         atomic_inc(&bss->users);
         memcpy(bss->bssid, bssid, ETH_ALEN);
-        bss->channel = channel;
+        bss->freq = freq;
         if (ssid && ssid_len <= IEEE80211_MAX_SSID_LEN) {
                 memcpy(bss->ssid, ssid, ssid_len);
                 bss->ssid_len = ssid_len;
@@ -1929,7 +1964,7 @@ ieee80211_rx_bss_add(struct net_device *dev, u8 *bssid, int channel,
 
 
 static struct ieee80211_sta_bss *
-ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid, int channel,
+ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid, int freq,
                      u8 *ssid, u8 ssid_len)
 {
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
@@ -1939,7 +1974,7 @@ ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid, int channel,
         bss = local->sta_bss_hash[STA_HASH(bssid)];
         while (bss) {
                 if (!memcmp(bss->bssid, bssid, ETH_ALEN) &&
-                    bss->channel == channel &&
+                    bss->freq == freq &&
                     bss->ssid_len == ssid_len &&
                     (ssid_len == 0 || !memcmp(bss->ssid, ssid, ssid_len))) {
                         atomic_inc(&bss->users);
@@ -2004,7 +2039,7 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct ieee802_11_elems elems;
         size_t baselen;
-        int channel, clen;
+        int freq, clen;
         struct ieee80211_sta_bss *bss;
         struct sta_info *sta;
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
@@ -2055,26 +2090,22 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
         if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS && elems.supp_rates &&
             memcmp(mgmt->bssid, sdata->u.sta.bssid, ETH_ALEN) == 0 &&
             (sta = sta_info_get(local, mgmt->sa))) {
-                struct ieee80211_hw_mode *mode;
-                struct ieee80211_rate *rates;
+                struct ieee80211_supported_band *sband;
+                struct ieee80211_rate *bitrates;
                 size_t num_rates;
-                u32 supp_rates, prev_rates;
+                u64 supp_rates, prev_rates;
                 int i, j;
 
-                mode = local->sta_sw_scanning ?
-                       local->scan_hw_mode : local->oper_hw_mode;
-
-                if (local->sta_hw_scanning) {
-                        /* search for the correct mode matches the beacon */
-                        list_for_each_entry(mode, &local->modes_list, list)
-                                if (mode->mode == rx_status->phymode)
-                                        break;
+                sband = local->hw.wiphy->bands[rx_status->band];
 
-                        if (mode == NULL)
-                                mode = local->oper_hw_mode;
+                if (!sband) {
+                        WARN_ON(1);
+                        sband = local->hw.wiphy->bands[
+                                        local->hw.conf.channel->band];
                 }
-                rates = mode->rates;
-                num_rates = mode->num_rates;
+
+                bitrates = sband->bitrates;
+                num_rates = sband->n_bitrates;
 
                 supp_rates = 0;
                 for (i = 0; i < elems.supp_rates_len +
@@ -2088,24 +2119,27 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
                                         [i - elems.supp_rates_len];
                         own_rate = 5 * (rate & 0x7f);
                         for (j = 0; j < num_rates; j++)
-                                if (rates[j].rate == own_rate)
+                                if (bitrates[j].bitrate == own_rate)
                                         supp_rates |= BIT(j);
                 }
 
-                prev_rates = sta->supp_rates;
-                sta->supp_rates &= supp_rates;
-                if (sta->supp_rates == 0) {
+                prev_rates = sta->supp_rates[rx_status->band];
+                sta->supp_rates[rx_status->band] &= supp_rates;
+                if (sta->supp_rates[rx_status->band] == 0) {
                         /* No matching rates - this should not really happen.
                          * Make sure that at least one rate is marked
                          * supported to avoid issues with TX rate ctrl. */
-                        sta->supp_rates = sdata->u.sta.supp_rates_bits;
+                        sta->supp_rates[rx_status->band] =
+                                sdata->u.sta.supp_rates_bits[rx_status->band];
                 }
-                if (sta->supp_rates != prev_rates) {
+                if (sta->supp_rates[rx_status->band] != prev_rates) {
                         printk(KERN_DEBUG "%s: updated supp_rates set for "
-                               "%s based on beacon info (0x%x & 0x%x -> "
-                               "0x%x)\n",
-                               dev->name, print_mac(mac, sta->addr), prev_rates,
-                               supp_rates, sta->supp_rates);
+                               "%s based on beacon info (0x%llx & 0x%llx -> "
+                               "0x%llx)\n",
+                               dev->name, print_mac(mac, sta->addr),
+                               (unsigned long long) prev_rates,
+                               (unsigned long long) supp_rates,
+                               (unsigned long long) sta->supp_rates[rx_status->band]);
                 }
                 sta_info_put(sta);
         }
@@ -2114,14 +2148,14 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
                 return;
 
         if (elems.ds_params && elems.ds_params_len == 1)
-                channel = elems.ds_params[0];
+                freq = ieee80211_channel_to_frequency(elems.ds_params[0]);
         else
-                channel = rx_status->channel;
+                freq = rx_status->freq;
 
-        bss = ieee80211_rx_bss_get(dev, mgmt->bssid, channel,
+        bss = ieee80211_rx_bss_get(dev, mgmt->bssid, freq,
                                    elems.ssid, elems.ssid_len);
         if (!bss) {
-                bss = ieee80211_rx_bss_add(dev, mgmt->bssid, channel,
+                bss = ieee80211_rx_bss_add(dev, mgmt->bssid, freq,
                                            elems.ssid, elems.ssid_len);
                 if (!bss)
                         return;
@@ -2134,6 +2168,8 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
 #endif
         }
 
+        bss->band = rx_status->band;
+
         if (bss->probe_resp && beacon) {
                 /* Do not allow beacon to override data from Probe Response. */
                 ieee80211_rx_bss_put(dev, bss);
@@ -2232,20 +2268,6 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
                 bss->ht_ie_len = 0;
         }
 
-        bss->hw_mode = rx_status->phymode;
-        bss->freq = rx_status->freq;
-        if (channel != rx_status->channel &&
-            (bss->hw_mode == MODE_IEEE80211G ||
-             bss->hw_mode == MODE_IEEE80211B) &&
-            channel >= 1 && channel <= 14) {
-                static const int freq_list[] = {
-                        2412, 2417, 2422, 2427, 2432, 2437, 2442,
-                        2447, 2452, 2457, 2462, 2467, 2472, 2484
-                };
-                /* IEEE 802.11g/b mode can receive packets from neighboring
-                 * channels, so map the channel into frequency. */
-                bss->freq = freq_list[channel - 1];
-        }
         bss->timestamp = timestamp;
         bss->last_update = jiffies;
         bss->rssi = rx_status->ssi;
@@ -2817,7 +2839,7 @@ static int ieee80211_sta_config_auth(struct net_device *dev,
         }
 
         spin_lock_bh(&local->sta_bss_lock);
-        freq = local->oper_channel->freq;
+        freq = local->oper_channel->center_freq;
         list_for_each_entry(bss, &local->sta_bss_list, list) {
                 if (!(bss->capability & WLAN_CAPABILITY_ESS))
                         continue;
@@ -2848,7 +2870,7 @@ static int ieee80211_sta_config_auth(struct net_device *dev,
         spin_unlock_bh(&local->sta_bss_lock);
 
         if (selected) {
-                ieee80211_set_channel(local, -1, selected->freq);
+                ieee80211_set_freq(local, selected->freq);
                 if (!(ifsta->flags & IEEE80211_STA_SSID_SET))
                         ieee80211_sta_set_ssid(dev, selected->ssid,
                                                selected->ssid_len);
@@ -2881,10 +2903,12 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
         struct sk_buff *skb;
         struct ieee80211_mgmt *mgmt;
         struct ieee80211_tx_control control;
-        struct ieee80211_hw_mode *mode;
         struct rate_selection ratesel;
         u8 *pos;
         struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_supported_band *sband;
+
+        sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
 
         /* Remove possible STA entries from other IBSS networks. */
         sta_info_flush(local, NULL);
@@ -2904,12 +2928,11 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
         sdata->drop_unencrypted = bss->capability &
                 WLAN_CAPABILITY_PRIVACY ? 1 : 0;
 
-        res = ieee80211_set_channel(local, -1, bss->freq);
+        res = ieee80211_set_freq(local, bss->freq);
 
-        if (!(local->oper_channel->flag & IEEE80211_CHAN_W_IBSS)) {
-                printk(KERN_DEBUG "%s: IBSS not allowed on channel %d "
-                       "(%d MHz)\n", dev->name, local->hw.conf.channel,
-                       local->hw.conf.freq);
+        if (local->oper_channel->flags & IEEE80211_CHAN_NO_IBSS) {
+                printk(KERN_DEBUG "%s: IBSS not allowed on frequency "
+                       "%d MHz\n", dev->name, local->oper_channel->center_freq);
                 return -1;
         }
 
@@ -2946,10 +2969,12 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
                 *pos++ = rates;
                 memcpy(pos, bss->supp_rates, rates);
 
-                pos = skb_put(skb, 2 + 1);
-                *pos++ = WLAN_EID_DS_PARAMS;
-                *pos++ = 1;
-                *pos++ = bss->channel;
+                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);
+                }
 
                 pos = skb_put(skb, 2 + 2);
                 *pos++ = WLAN_EID_IBSS_PARAMS;
@@ -2967,19 +2992,18 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
                 }
 
                 memset(&control, 0, sizeof(control));
-                rate_control_get_rate(dev, local->oper_hw_mode, skb, &ratesel);
+                rate_control_get_rate(dev, sband, skb, &ratesel);
                 if (!ratesel.rate) {
                         printk(KERN_DEBUG "%s: Failed to determine TX rate "
                                "for IBSS beacon\n", dev->name);
                         break;
                 }
                 control.vif = &sdata->vif;
-                control.tx_rate =
-                        (sdata->bss_conf.use_short_preamble &&
-                        (ratesel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ?
-                        ratesel.rate->val2 : ratesel.rate->val;
+                control.tx_rate = ratesel.rate;
+                if (sdata->bss_conf.use_short_preamble &&
+                    ratesel.rate->flags & IEEE80211_RATE_SHORT_PREAMBLE)
+                        control.flags |= IEEE80211_TXCTL_SHORT_PREAMBLE;
                 control.antenna_sel_tx = local->hw.conf.antenna_sel_tx;
-                control.power_level = local->hw.conf.power_level;
                 control.flags |= IEEE80211_TXCTL_NO_ACK;
                 control.retry_limit = 1;
 
@@ -3004,14 +3028,14 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
                 }
 
                 rates = 0;
-                mode = local->oper_hw_mode;
+                sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
                 for (i = 0; i < bss->supp_rates_len; i++) {
                         int bitrate = (bss->supp_rates[i] & 0x7f) * 5;
-                        for (j = 0; j < mode->num_rates; j++)
-                                if (mode->rates[j].rate == bitrate)
+                        for (j = 0; j < sband->n_bitrates; j++)
+                                if (sband->bitrates[j].bitrate == bitrate)
                                         rates |= BIT(j);
                 }
-                ifsta->supp_rates_bits = rates;
+                ifsta->supp_rates_bits[local->hw.conf.channel->band] = rates;
         } while (0);
 
         if (skb) {
@@ -3035,7 +3059,7 @@ static int ieee80211_sta_create_ibss(struct net_device *dev,
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct ieee80211_sta_bss *bss;
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-        struct ieee80211_hw_mode *mode;
+        struct ieee80211_supported_band *sband;
         u8 bssid[ETH_ALEN], *pos;
         int i;
         DECLARE_MAC_BUF(mac);
@@ -3057,28 +3081,28 @@ static int ieee80211_sta_create_ibss(struct net_device *dev,
         printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID %s\n",
                dev->name, print_mac(mac, bssid));
 
-        bss = ieee80211_rx_bss_add(dev, bssid, local->hw.conf.channel,
+        bss = ieee80211_rx_bss_add(dev, bssid,
+                                   local->hw.conf.channel->center_freq,
                                    sdata->u.sta.ssid, sdata->u.sta.ssid_len);
         if (!bss)
                 return -ENOMEM;
 
-        mode = local->oper_hw_mode;
+        bss->band = local->hw.conf.channel->band;
+        sband = local->hw.wiphy->bands[bss->band];
 
         if (local->hw.conf.beacon_int == 0)
                 local->hw.conf.beacon_int = 100;
         bss->beacon_int = local->hw.conf.beacon_int;
-        bss->hw_mode = local->hw.conf.phymode;
-        bss->freq = local->hw.conf.freq;
         bss->last_update = jiffies;
         bss->capability = WLAN_CAPABILITY_IBSS;
         if (sdata->default_key) {
                 bss->capability |= WLAN_CAPABILITY_PRIVACY;
         } else
                 sdata->drop_unencrypted = 0;
-        bss->supp_rates_len = mode->num_rates;
+        bss->supp_rates_len = sband->n_bitrates;
         pos = bss->supp_rates;
-        for (i = 0; i < mode->num_rates; i++) {
-                int rate = mode->rates[i].rate;
+        for (i = 0; i < sband->n_bitrates; i++) {
+                int rate = sband->bitrates[i].bitrate;
                 *pos++ = (u8) (rate / 5);
         }
 
@@ -3127,7 +3151,8 @@ static int ieee80211_sta_find_ibss(struct net_device *dev,
                "%s\n", print_mac(mac, bssid), print_mac(mac2, ifsta->bssid));
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
         if (found && memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0 &&
-            (bss = ieee80211_rx_bss_get(dev, bssid, local->hw.conf.channel,
+            (bss = ieee80211_rx_bss_get(dev, bssid,
+                                        local->hw.conf.channel->center_freq,
                                         ifsta->ssid, ifsta->ssid_len))) {
                 printk(KERN_DEBUG "%s: Selected IBSS BSSID %s"
                        " based on configured SSID\n",
@@ -3155,13 +3180,13 @@ static int ieee80211_sta_find_ibss(struct net_device *dev,
                 if (time_after(jiffies, ifsta->ibss_join_req +
                                IEEE80211_IBSS_JOIN_TIMEOUT)) {
                         if ((ifsta->flags & IEEE80211_STA_CREATE_IBSS) &&
-                            local->oper_channel->flag & IEEE80211_CHAN_W_IBSS)
+                            (!(local->oper_channel->flags &
+                                        IEEE80211_CHAN_NO_IBSS)))
                                 return ieee80211_sta_create_ibss(dev, ifsta);
                         if (ifsta->flags & IEEE80211_STA_CREATE_IBSS) {
-                                printk(KERN_DEBUG "%s: IBSS not allowed on the"
-                                       " configured channel %d (%d MHz)\n",
-                                       dev->name, local->hw.conf.channel,
-                                       local->hw.conf.freq);
+                                printk(KERN_DEBUG "%s: IBSS not allowed on"
+                                       " %d MHz\n", dev->name,
+                                       local->hw.conf.channel->center_freq);
                         }
 
                         /* No IBSS found - decrease scan interval and continue
@@ -3180,7 +3205,7 @@ static int ieee80211_sta_find_ibss(struct net_device *dev,
 
 int ieee80211_sta_set_ssid(struct net_device *dev, char *ssid, size_t len)
 {
-        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         struct ieee80211_if_sta *ifsta;
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
 
@@ -3194,18 +3219,23 @@ int ieee80211_sta_set_ssid(struct net_device *dev, char *ssid, size_t len)
                 int i;
 
                 memset(&qparam, 0, sizeof(qparam));
-                /* TODO: are these ok defaults for all hw_modes? */
+
                 qparam.aifs = 2;
-                qparam.cw_min =
-                        local->hw.conf.phymode == MODE_IEEE80211B ? 31 : 15;
+
+                if (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ &&
+                    !(sdata->flags & IEEE80211_SDATA_OPERATING_GMODE))
+                        qparam.cw_min = 31;
+                else
+                        qparam.cw_min = 15;
+
                 qparam.cw_max = 1023;
                 qparam.burst_time = 0;
+
                 for (i = IEEE80211_TX_QUEUE_DATA0; i < NUM_TX_DATA_QUEUES; i++)
-                {
                         local->ops->conf_tx(local_to_hw(local),
                                            i + IEEE80211_TX_QUEUE_DATA0,
                                            &qparam);
-                }
+
                 /* IBSS uses different parameters for Beacon sending */
                 qparam.cw_min++;
                 qparam.cw_min *= 2;
@@ -3214,7 +3244,6 @@ int ieee80211_sta_set_ssid(struct net_device *dev, char *ssid, size_t len)
                                    IEEE80211_TX_QUEUE_BEACON, &qparam);
         }
 
-        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         ifsta = &sdata->u.sta;
 
         if (ifsta->ssid_len != len || memcmp(ifsta->ssid, ssid, len) != 0)
@@ -3373,7 +3402,7 @@ void ieee80211_sta_scan_work(struct work_struct *work)
                 container_of(work, struct ieee80211_local, scan_work.work);
         struct net_device *dev = local->scan_dev;
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-        struct ieee80211_hw_mode *mode;
+        struct ieee80211_supported_band *sband;
         struct ieee80211_channel *chan;
         int skip;
         unsigned long next_delay = 0;
@@ -3383,44 +3412,47 @@ void ieee80211_sta_scan_work(struct work_struct *work)
 
         switch (local->scan_state) {
         case SCAN_SET_CHANNEL:
-                mode = local->scan_hw_mode;
-                if (local->scan_hw_mode->list.next == &local->modes_list &&
-                    local->scan_channel_idx >= mode->num_channels) {
+                /* get current scan band */
+                if (local->scan_band < IEEE80211_NUM_BANDS)
+                        sband = local->hw.wiphy->bands[local->scan_band];
+                else
+                        sband = NULL;
+
+                /* if we started at an unsupported one, advance */
+                while (!sband && local->scan_band < IEEE80211_NUM_BANDS) {
+                        local->scan_band++;
+                        sband = local->hw.wiphy->bands[local->scan_band];
+                        local->scan_channel_idx = 0;
+                }
+
+                if (!sband ||
+                    (local->scan_channel_idx >= sband->n_channels &&
+                     local->scan_band >= IEEE80211_NUM_BANDS)) {
                         ieee80211_scan_completed(local_to_hw(local));
                         return;
                 }
-                skip = !(local->enabled_modes & (1 << mode->mode));
-                chan = &mode->channels[local->scan_channel_idx];
-                if (!(chan->flag & IEEE80211_CHAN_W_SCAN) ||
+                skip = 0;
+                chan = &sband->channels[local->scan_channel_idx];
+
+                if (chan->flags & IEEE80211_CHAN_DISABLED ||
                     (sdata->vif.type == IEEE80211_IF_TYPE_IBSS &&
-                     !(chan->flag & IEEE80211_CHAN_W_IBSS)) ||
-                    (local->hw_modes & local->enabled_modes &
-                     (1 << MODE_IEEE80211G) && mode->mode == MODE_IEEE80211B))
+                     chan->flags & IEEE80211_CHAN_NO_IBSS))
                         skip = 1;
 
                 if (!skip) {
-#if 0
-                        printk(KERN_DEBUG "%s: scan channel %d (%d MHz)\n",
-                               dev->name, chan->chan, chan->freq);
-#endif
-
                         local->scan_channel = chan;
                         if (ieee80211_hw_config(local)) {
-                                printk(KERN_DEBUG "%s: failed to set channel "
-                                       "%d (%d MHz) for scan\n", dev->name,
-                                       chan->chan, chan->freq);
+                                printk(KERN_DEBUG "%s: failed to set freq to "
+                                       "%d MHz for scan\n", dev->name,
+                                       chan->center_freq);
                                 skip = 1;
                         }
                 }
 
                 local->scan_channel_idx++;
-                if (local->scan_channel_idx >= local->scan_hw_mode->num_channels) {
-                        if (local->scan_hw_mode->list.next != &local->modes_list) {
-                                local->scan_hw_mode = list_entry(local->scan_hw_mode->list.next,
-                                                                 struct ieee80211_hw_mode,
-                                                                 list);
-                                local->scan_channel_idx = 0;
-                        }
+                if (local->scan_channel_idx >= sband->n_channels) {
+                        local->scan_band++;
+                        local->scan_channel_idx = 0;
                 }
 
                 if (skip)
@@ -3431,13 +3463,14 @@ void ieee80211_sta_scan_work(struct work_struct *work)
                 local->scan_state = SCAN_SEND_PROBE;
                 break;
         case SCAN_SEND_PROBE:
-                if (local->scan_channel->flag & IEEE80211_CHAN_W_ACTIVE_SCAN) {
-                        ieee80211_send_probe_req(dev, NULL, local->scan_ssid,
-                                                 local->scan_ssid_len);
-                        next_delay = IEEE80211_CHANNEL_TIME;
-                } else
-                        next_delay = IEEE80211_PASSIVE_CHANNEL_TIME;
+                next_delay = IEEE80211_PASSIVE_CHANNEL_TIME;
                 local->scan_state = SCAN_SET_CHANNEL;
+
+                if (local->scan_channel->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+                        break;
+                ieee80211_send_probe_req(dev, NULL, local->scan_ssid,
+                                         local->scan_ssid_len);
+                next_delay = IEEE80211_CHANNEL_TIME;
                 break;
         }
 
@@ -3512,10 +3545,8 @@ static int ieee80211_sta_start_scan(struct net_device *dev,
         } else
                 local->scan_ssid_len = 0;
         local->scan_state = SCAN_SET_CHANNEL;
-        local->scan_hw_mode = list_entry(local->modes_list.next,
-                                         struct ieee80211_hw_mode,
-                                         list);
         local->scan_channel_idx = 0;
+        local->scan_band = IEEE80211_BAND_2GHZ;
         local->scan_dev = dev;
 
         netif_tx_lock_bh(local->mdev);
@@ -3570,9 +3601,6 @@ ieee80211_sta_scan_result(struct net_device *dev,
                        bss->last_update + IEEE80211_SCAN_RESULT_EXPIRE))
                 return current_ev;
 
-        if (!(local->enabled_modes & (1 << bss->hw_mode)))
-                return current_ev;
-
         memset(&iwe, 0, sizeof(iwe));
         iwe.cmd = SIOCGIWAP;
         iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
@@ -3600,12 +3628,15 @@ ieee80211_sta_scan_result(struct net_device *dev,
 
         memset(&iwe, 0, sizeof(iwe));
         iwe.cmd = SIOCGIWFREQ;
-        iwe.u.freq.m = bss->channel;
-        iwe.u.freq.e = 0;
+        iwe.u.freq.m = bss->freq;
+        iwe.u.freq.e = 6;
         current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
                                           IW_EV_FREQ_LEN);
-        iwe.u.freq.m = bss->freq * 100000;
-        iwe.u.freq.e = 1;
+
+        memset(&iwe, 0, sizeof(iwe));
+        iwe.cmd = SIOCGIWFREQ;
+        iwe.u.freq.m = ieee80211_frequency_to_channel(bss->freq);
+        iwe.u.freq.e = 0;
         current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
                                           IW_EV_FREQ_LEN);
 
@@ -3748,7 +3779,8 @@ struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
         if (!sta)
                 return NULL;
 
-        sta->supp_rates = sdata->u.sta.supp_rates_bits;
+        sta->supp_rates[local->hw.conf.channel->band] =
+                sdata->u.sta.supp_rates_bits[local->hw.conf.channel->band];
 
         rate_control_rate_init(sta, local);