1 files changed, 102 insertions, 62 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 38e1b2bd8245..9e5359991985 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -92,9 +92,13 @@ static u16 ieee80211_duration(struct ieee80211_txrx_data *tx, int group_addr,
         int rate, mrate, erp, dur, i;
         struct ieee80211_rate *txrate = tx->u.tx.rate;
         struct ieee80211_local *local = tx->local;
-        struct ieee80211_hw_mode *mode = tx->u.tx.mode;
+        struct ieee80211_supported_band *sband;
 
-        erp = txrate->flags & IEEE80211_RATE_ERP;
+        sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
+
+        erp = 0;
+        if (tx->sdata->flags & IEEE80211_SDATA_OPERATING_GMODE)
+                erp = txrate->flags & IEEE80211_RATE_ERP_G;
 
         /*
          * data and mgmt (except PS Poll):
@@ -150,20 +154,36 @@ static u16 ieee80211_duration(struct ieee80211_txrx_data *tx, int group_addr,
          * Mandatory rates for IEEE 802.11g PHY: 1, 2, 5.5, 11, 6, 12, 24 Mbps
          */
         rate = -1;
-        mrate = 10; /* use 1 Mbps if everything fails */
-        for (i = 0; i < mode->num_rates; i++) {
-                struct ieee80211_rate *r = &mode->rates[i];
-                if (r->rate > txrate->rate)
-                        break;
+        /* use lowest available if everything fails */
+        mrate = sband->bitrates[0].bitrate;
+        for (i = 0; i < sband->n_bitrates; i++) {
+                struct ieee80211_rate *r = &sband->bitrates[i];
 
-                if (IEEE80211_RATE_MODULATION(txrate->flags) !=
-                    IEEE80211_RATE_MODULATION(r->flags))
-                        continue;
+                if (r->bitrate > txrate->bitrate)
+                        break;
 
-                if (r->flags & IEEE80211_RATE_BASIC)
-                        rate = r->rate;
-                else if (r->flags & IEEE80211_RATE_MANDATORY)
-                        mrate = r->rate;
+                if (tx->sdata->basic_rates & BIT(i))
+                        rate = r->bitrate;
+
+                switch (sband->band) {
+                case IEEE80211_BAND_2GHZ: {
+                        u32 flag;
+                        if (tx->sdata->flags & IEEE80211_SDATA_OPERATING_GMODE)
+                                flag = IEEE80211_RATE_MANDATORY_G;
+                        else
+                                flag = IEEE80211_RATE_MANDATORY_B;
+                        if (r->flags & flag)
+                                mrate = r->bitrate;
+                        break;
+                }
+                case IEEE80211_BAND_5GHZ:
+                        if (r->flags & IEEE80211_RATE_MANDATORY_A)
+                                mrate = r->bitrate;
+                        break;
+                case IEEE80211_NUM_BANDS:
+                        WARN_ON(1);
+                        break;
+                }
         }
         if (rate == -1) {
                 /* No matching basic rate found; use highest suitable mandatory
@@ -184,7 +204,7 @@ static u16 ieee80211_duration(struct ieee80211_txrx_data *tx, int group_addr,
                 dur *= 2; /* ACK + SIFS */
                 /* next fragment */
                 dur += ieee80211_frame_duration(local, next_frag_len,
-                                txrate->rate, erp,
+                                txrate->bitrate, erp,
                                 tx->sdata->bss_conf.use_short_preamble);
         }
 
@@ -585,26 +605,28 @@ static ieee80211_txrx_result
 ieee80211_tx_h_rate_ctrl(struct ieee80211_txrx_data *tx)
 {
         struct rate_selection rsel;
+        struct ieee80211_supported_band *sband;
+
+        sband = tx->local->hw.wiphy->bands[tx->local->hw.conf.channel->band];
 
         if (likely(!tx->u.tx.rate)) {
-                rate_control_get_rate(tx->dev, tx->u.tx.mode, tx->skb, &rsel);
+                rate_control_get_rate(tx->dev, sband, tx->skb, &rsel);
                 tx->u.tx.rate = rsel.rate;
-                if (unlikely(rsel.probe != NULL)) {
+                if (unlikely(rsel.probe)) {
                         tx->u.tx.control->flags |=
                                 IEEE80211_TXCTL_RATE_CTRL_PROBE;
                         tx->flags |= IEEE80211_TXRXD_TXPROBE_LAST_FRAG;
-                        tx->u.tx.control->alt_retry_rate = tx->u.tx.rate->val;
+                        tx->u.tx.control->alt_retry_rate = tx->u.tx.rate;
                         tx->u.tx.rate = rsel.probe;
                 } else
-                        tx->u.tx.control->alt_retry_rate = -1;
+                        tx->u.tx.control->alt_retry_rate = NULL;
 
                 if (!tx->u.tx.rate)
                         return TXRX_DROP;
         } else
-                tx->u.tx.control->alt_retry_rate = -1;
+                tx->u.tx.control->alt_retry_rate = NULL;
 
-        if (tx->u.tx.mode->mode == MODE_IEEE80211G &&
-            tx->sdata->bss_conf.use_cts_prot &&
+        if (tx->sdata->bss_conf.use_cts_prot &&
             (tx->flags & IEEE80211_TXRXD_FRAGMENTED) && rsel.nonerp) {
                 tx->u.tx.last_frag_rate = tx->u.tx.rate;
                 if (rsel.probe)
@@ -612,13 +634,13 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_txrx_data *tx)
                 else
                         tx->flags |= IEEE80211_TXRXD_TXPROBE_LAST_FRAG;
                 tx->u.tx.rate = rsel.nonerp;
-                tx->u.tx.control->rate = rsel.nonerp;
+                tx->u.tx.control->tx_rate = rsel.nonerp;
                 tx->u.tx.control->flags &= ~IEEE80211_TXCTL_RATE_CTRL_PROBE;
         } else {
                 tx->u.tx.last_frag_rate = tx->u.tx.rate;
-                tx->u.tx.control->rate = tx->u.tx.rate;
+                tx->u.tx.control->tx_rate = tx->u.tx.rate;
         }
-        tx->u.tx.control->tx_rate = tx->u.tx.rate->val;
+        tx->u.tx.control->tx_rate = tx->u.tx.rate;
 
         return TXRX_CONTINUE;
 }
@@ -630,7 +652,6 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
         u16 fc = le16_to_cpu(hdr->frame_control);
         u16 dur;
         struct ieee80211_tx_control *control = tx->u.tx.control;
-        struct ieee80211_hw_mode *mode = tx->u.tx.mode;
 
         if (!control->retry_limit) {
                 if (!is_multicast_ether_addr(hdr->addr1)) {
@@ -657,14 +678,14 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
                  * frames.
                  * TODO: The last fragment could still use multiple retry
                  * rates. */
-                control->alt_retry_rate = -1;
+                control->alt_retry_rate = NULL;
         }
 
         /* Use CTS protection for unicast frames sent using extended rates if
          * there are associated non-ERP stations and RTS/CTS is not configured
          * for the frame. */
-        if (mode->mode == MODE_IEEE80211G &&
-            (tx->u.tx.rate->flags & IEEE80211_RATE_ERP) &&
+        if ((tx->sdata->flags & IEEE80211_SDATA_OPERATING_GMODE) &&
+            (tx->u.tx.rate->flags & IEEE80211_RATE_ERP_G) &&
             (tx->flags & IEEE80211_TXRXD_TXUNICAST) &&
             tx->sdata->bss_conf.use_cts_prot &&
             !(control->flags & IEEE80211_TXCTL_USE_RTS_CTS))
@@ -674,10 +695,10 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
          * short preambles at the selected rate and short preambles are
          * available on the network at the current point in time. */
         if (((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) &&
-            (tx->u.tx.rate->flags & IEEE80211_RATE_PREAMBLE2) &&
+            (tx->u.tx.rate->flags & IEEE80211_RATE_SHORT_PREAMBLE) &&
             tx->sdata->bss_conf.use_short_preamble &&
             (!tx->sta || (tx->sta->flags & WLAN_STA_SHORT_PREAMBLE))) {
-                tx->u.tx.control->tx_rate = tx->u.tx.rate->val2;
+                tx->u.tx.control->flags |= IEEE80211_TXCTL_SHORT_PREAMBLE;
         }
 
         /* Setup duration field for the first fragment of the frame. Duration
@@ -690,19 +711,33 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
 
         if ((control->flags & IEEE80211_TXCTL_USE_RTS_CTS) ||
             (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)) {
-                struct ieee80211_rate *rate;
+                struct ieee80211_supported_band *sband;
+                struct ieee80211_rate *rate, *baserate;
+                int idx;
+
+                sband = tx->local->hw.wiphy->bands[
+                                tx->local->hw.conf.channel->band];
 
                 /* Do not use multiple retry rates when using RTS/CTS */
-                control->alt_retry_rate = -1;
+                control->alt_retry_rate = NULL;
 
                 /* Use min(data rate, max base rate) as CTS/RTS rate */
                 rate = tx->u.tx.rate;
-                while (rate > mode->rates &&
-                       !(rate->flags & IEEE80211_RATE_BASIC))
-                        rate--;
+                baserate = NULL;
+
+                for (idx = 0; idx < sband->n_bitrates; idx++) {
+                        if (sband->bitrates[idx].bitrate > rate->bitrate)
+                                continue;
+                        if (tx->sdata->basic_rates & BIT(idx) &&
+                            (!baserate ||
+                             (baserate->bitrate < sband->bitrates[idx].bitrate)))
+                                baserate = &sband->bitrates[idx];
+                }
 
-                control->rts_cts_rate = rate->val;
-                control->rts_rate = rate;
+                if (baserate)
+                        control->rts_cts_rate = baserate;
+                else
+                        control->rts_cts_rate = &sband->bitrates[0];
         }
 
         if (tx->sta) {
@@ -726,10 +761,10 @@ static ieee80211_txrx_result
 ieee80211_tx_h_load_stats(struct ieee80211_txrx_data *tx)
 {
         struct ieee80211_local *local = tx->local;
-        struct ieee80211_hw_mode *mode = tx->u.tx.mode;
         struct sk_buff *skb = tx->skb;
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
         u32 load = 0, hdrtime;
+        struct ieee80211_rate *rate = tx->u.tx.rate;
 
         /* TODO: this could be part of tx_status handling, so that the number
          * of retries would be known; TX rate should in that case be stored
@@ -740,9 +775,9 @@ ieee80211_tx_h_load_stats(struct ieee80211_txrx_data *tx)
         /* 1 bit at 1 Mbit/s takes 1 usec; in channel_use values,
          * 1 usec = 1/8 * (1080 / 10) = 13.5 */
 
-        if (mode->mode == MODE_IEEE80211A ||
-            (mode->mode == MODE_IEEE80211G &&
-             tx->u.tx.rate->flags & IEEE80211_RATE_ERP))
+        if (tx->u.tx.channel->band == IEEE80211_BAND_5GHZ ||
+            (tx->u.tx.channel->band == IEEE80211_BAND_2GHZ &&
+             rate->flags & IEEE80211_RATE_ERP_G))
                 hdrtime = CHAN_UTIL_HDR_SHORT;
         else
                 hdrtime = CHAN_UTIL_HDR_LONG;
@@ -756,14 +791,15 @@ ieee80211_tx_h_load_stats(struct ieee80211_txrx_data *tx)
         else if (tx->u.tx.control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
                 load += hdrtime;
 
-        load += skb->len * tx->u.tx.rate->rate_inv;
+        /* TODO: optimise again */
+        load += skb->len * CHAN_UTIL_RATE_LCM / rate->bitrate;
 
         if (tx->u.tx.extra_frag) {
                 int i;
                 for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
                         load += 2 * hdrtime;
                         load += tx->u.tx.extra_frag[i]->len *
-                                tx->u.tx.rate->rate;
+                                tx->u.tx.rate->bitrate;
                 }
         }
 
@@ -816,10 +852,12 @@ __ieee80211_parse_tx_radiotap(struct ieee80211_txrx_data *tx,
         struct ieee80211_radiotap_iterator iterator;
         struct ieee80211_radiotap_header *rthdr =
                 (struct ieee80211_radiotap_header *) skb->data;
-        struct ieee80211_hw_mode *mode = tx->local->hw.conf.mode;
+        struct ieee80211_supported_band *sband;
         int ret = ieee80211_radiotap_iterator_init(&iterator, rthdr, skb->len);
         struct ieee80211_tx_control *control = tx->u.tx.control;
 
+        sband = tx->local->hw.wiphy->bands[tx->local->hw.conf.channel->band];
+
         control->flags |= IEEE80211_TXCTL_DO_NOT_ENCRYPT;
         tx->flags |= IEEE80211_TXRXD_TX_INJECTED;
         tx->flags &= ~IEEE80211_TXRXD_FRAGMENTED;
@@ -852,10 +890,12 @@ __ieee80211_parse_tx_radiotap(struct ieee80211_txrx_data *tx,
                          * ieee80211 rate int is in 100kbps units eg, 0x0a=1Mbps
                          */
                         target_rate = (*iterator.this_arg) * 5;
-                        for (i = 0; i < mode->num_rates; i++) {
-                                struct ieee80211_rate *r = &mode->rates[i];
+                        for (i = 0; i < sband->n_bitrates; i++) {
+                                struct ieee80211_rate *r;
 
-                                if (r->rate == target_rate) {
+                                r = &sband->bitrates[i];
+
+                                if (r->bitrate == target_rate) {
                                         tx->u.tx.rate = r;
                                         break;
                                 }
@@ -870,9 +910,11 @@ __ieee80211_parse_tx_radiotap(struct ieee80211_txrx_data *tx,
                         control->antenna_sel_tx = (*iterator.this_arg) + 1;
                         break;
 
+#if 0
                 case IEEE80211_RADIOTAP_DBM_TX_POWER:
                         control->power_level = *iterator.this_arg;
                         break;
+#endif
 
                 case IEEE80211_RADIOTAP_FLAGS:
                         if (*iterator.this_arg & IEEE80211_RADIOTAP_F_FCS) {
@@ -1054,8 +1096,8 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
                         if (__ieee80211_queue_stopped(local, control->queue))
                                 return IEEE80211_TX_FRAG_AGAIN;
                         if (i == tx->u.tx.num_extra_frag) {
-                                control->tx_rate = tx->u.tx.last_frag_hwrate;
-                                control->rate = tx->u.tx.last_frag_rate;
+                                control->tx_rate = tx->u.tx.last_frag_rate;
+
                                 if (tx->flags & IEEE80211_TXRXD_TXPROBE_LAST_FRAG)
                                         control->flags |=
                                                 IEEE80211_TXCTL_RATE_CTRL_PROBE;
@@ -1114,7 +1156,7 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb,
         rcu_read_lock();
 
         sta = tx.sta;
-        tx.u.tx.mode = local->hw.conf.mode;
+        tx.u.tx.channel = local->hw.conf.channel;
 
         for (handler = local->tx_handlers; *handler != NULL;
              handler++) {
@@ -1151,7 +1193,6 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb,
                         } else {
                                 next_len = 0;
                                 tx.u.tx.rate = tx.u.tx.last_frag_rate;
-                                tx.u.tx.last_frag_hwrate = tx.u.tx.rate->val;
                         }
                         dur = ieee80211_duration(&tx, 0, next_len);
                         hdr->duration_id = cpu_to_le16(dur);
@@ -1188,7 +1229,6 @@ retry:
                 store->skb = skb;
                 store->extra_frag = tx.u.tx.extra_frag;
                 store->num_extra_frag = tx.u.tx.num_extra_frag;
-                store->last_frag_hwrate = tx.u.tx.last_frag_hwrate;
                 store->last_frag_rate = tx.u.tx.last_frag_rate;
                 store->last_frag_rate_ctrl_probe =
                         !!(tx.flags & IEEE80211_TXRXD_TXPROBE_LAST_FRAG);
@@ -1609,7 +1649,6 @@ void ieee80211_tx_pending(unsigned long data)
                 tx.u.tx.control = &store->control;
                 tx.u.tx.extra_frag = store->extra_frag;
                 tx.u.tx.num_extra_frag = store->num_extra_frag;
-                tx.u.tx.last_frag_hwrate = store->last_frag_hwrate;
                 tx.u.tx.last_frag_rate = store->last_frag_rate;
                 tx.flags = 0;
                 if (store->last_frag_rate_ctrl_probe)
@@ -1712,6 +1751,9 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
         struct ieee80211_if_ap *ap = NULL;
         struct rate_selection rsel;
         struct beacon_data *beacon;
+        struct ieee80211_supported_band *sband;
+
+        sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
 
         rcu_read_lock();
 
@@ -1750,8 +1792,7 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
                        beacon->tail_len);
 
         if (control) {
-                rate_control_get_rate(local->mdev, local->oper_hw_mode, skb,
-                                      &rsel);
+                rate_control_get_rate(local->mdev, sband, skb, &rsel);
                 if (!rsel.rate) {
                         if (net_ratelimit()) {
                                 printk(KERN_DEBUG "%s: ieee80211_beacon_get: "
@@ -1764,12 +1805,11 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
                 }
 
                 control->vif = vif;
-                control->tx_rate =
-                        (sdata->bss_conf.use_short_preamble &&
-                        (rsel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ?
-                        rsel.rate->val2 : rsel.rate->val;
+                control->tx_rate = rsel.rate;
+                if (sdata->bss_conf.use_short_preamble &&
+                    rsel.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;
                 control->flags |= IEEE80211_TXCTL_CLEAR_DST_MASK;
@@ -1874,7 +1914,7 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw,
         }
         sta = tx.sta;
         tx.flags |= IEEE80211_TXRXD_TXPS_BUFFERED;
-        tx.u.tx.mode = local->hw.conf.mode;
+        tx.u.tx.channel = local->hw.conf.channel;
 
         for (handler = local->tx_handlers; *handler != NULL; handler++) {
                 res = (*handler)(&tx);