1 files changed, 18 insertions, 24 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 12c15588af68..4655e3038658 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -569,21 +569,17 @@ ieee80211_tx_h_encrypt(struct ieee80211_txrx_data *tx)
 static ieee80211_txrx_result
 ieee80211_tx_h_rate_ctrl(struct ieee80211_txrx_data *tx)
 {
-        struct rate_control_extra extra;
+        struct rate_selection rsel;
 
         if (likely(!tx->u.tx.rate)) {
-                memset(&extra, 0, sizeof(extra));
-                extra.mode = tx->u.tx.mode;
-                extra.ethertype = tx->ethertype;
-
-                tx->u.tx.rate = rate_control_get_rate(tx->local, tx->dev,
-                                                      tx->skb, &extra);
-                if (unlikely(extra.probe != NULL)) {
+                rate_control_get_rate(tx->dev, tx->u.tx.mode, tx->skb, &rsel);
+                tx->u.tx.rate = rsel.rate;
+                if (unlikely(rsel.probe != NULL)) {
                         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.rate = extra.probe;
+                        tx->u.tx.rate = rsel.probe;
                 } else
                         tx->u.tx.control->alt_retry_rate = -1;
 
@@ -594,14 +590,14 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_txrx_data *tx)
 
         if (tx->u.tx.mode->mode == MODE_IEEE80211G &&
             (tx->sdata->flags & IEEE80211_SDATA_USE_PROTECTION) &&
-            (tx->flags & IEEE80211_TXRXD_FRAGMENTED) && extra.nonerp) {
+            (tx->flags & IEEE80211_TXRXD_FRAGMENTED) && rsel.nonerp) {
                 tx->u.tx.last_frag_rate = tx->u.tx.rate;
-                if (extra.probe)
+                if (rsel.probe)
                         tx->flags &= ~IEEE80211_TXRXD_TXPROBE_LAST_FRAG;
                 else
                         tx->flags |= IEEE80211_TXRXD_TXPROBE_LAST_FRAG;
-                tx->u.tx.rate = extra.nonerp;
-                tx->u.tx.control->rate = extra.nonerp;
+                tx->u.tx.rate = rsel.nonerp;
+                tx->u.tx.control->rate = rsel.nonerp;
                 tx->u.tx.control->flags &= ~IEEE80211_TXCTL_RATE_CTRL_PROBE;
         } else {
                 tx->u.tx.last_frag_rate = tx->u.tx.rate;
@@ -1667,8 +1663,7 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, int if_id,
         struct net_device *bdev;
         struct ieee80211_sub_if_data *sdata = NULL;
         struct ieee80211_if_ap *ap = NULL;
-        struct ieee80211_rate *rate;
-        struct rate_control_extra extra;
+        struct rate_selection rsel;
         u8 *b_head, *b_tail;
         int bh_len, bt_len;
 
@@ -1712,14 +1707,13 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, int if_id,
         }
 
         if (control) {
-                memset(&extra, 0, sizeof(extra));
-                extra.mode = local->oper_hw_mode;
-
-                rate = rate_control_get_rate(local, local->mdev, skb, &extra);
-                if (!rate) {
+                rate_control_get_rate(local->mdev, local->oper_hw_mode, skb,
+                                      &rsel);
+                if (!rsel.rate) {
                         if (net_ratelimit()) {
-                                printk(KERN_DEBUG "%s: ieee80211_beacon_get: no rate "
-                                       "found\n", wiphy_name(local->hw.wiphy));
+                                printk(KERN_DEBUG "%s: ieee80211_beacon_get: "
+                                       "no rate found\n",
+                                       wiphy_name(local->hw.wiphy));
                         }
                         dev_kfree_skb(skb);
                         return NULL;
@@ -1727,8 +1721,8 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, int if_id,
 
                 control->tx_rate =
                         ((sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE) &&
-                        (rate->flags & IEEE80211_RATE_PREAMBLE2)) ?
-                        rate->val2 : rate->val;
+                        (rsel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ?
+                        rsel.rate->val2 : rsel.rate->val;
                 control->antenna_sel_tx = local->hw.conf.antenna_sel_tx;
                 control->power_level = local->hw.conf.power_level;
                 control->flags |= IEEE80211_TXCTL_NO_ACK;