mac80211: clean up rate selection

Move some code out of rc80211_simple since it's probably needed for all rate
selection algorithms, and fix iwlwifi accordingly. While at it, clean up the
rate_control_get_rate() interface.

Signed-off-by: Stefano Brivio <stefano.brivio@polimi.it>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 53 deletions

diff --git a/net/mac80211/rc80211_simple.c b/net/mac80211/rc80211_simple.c
index da72737364e4..c1c8b76a56af 100644
--- a/net/mac80211/rc80211_simple.c
+++ b/net/mac80211/rc80211_simple.c
@@ -23,6 +23,8 @@
 /* This is a minimal implementation of TX rate controlling that can be used
  * as the default when no improved mechanisms are available. */
 
+#define RATE_CONTROL_NUM_DOWN 20
+#define RATE_CONTROL_NUM_UP   15
 
 #define RATE_CONTROL_EMERG_DEC 2
 #define RATE_CONTROL_INTERVAL (HZ / 20)
@@ -87,26 +89,6 @@ static void rate_control_rate_dec(struct ieee80211_local *local,
         }
 }
 
-
-static struct ieee80211_rate *
-rate_control_lowest_rate(struct ieee80211_local *local,
-                         struct ieee80211_hw_mode *mode)
-{
-        int i;
-
-        for (i = 0; i < mode->num_rates; i++) {
-                struct ieee80211_rate *rate = &mode->rates[i];
-
-                if (rate->flags & IEEE80211_RATE_SUPPORTED)
-                        return rate;
-        }
-
-        printk(KERN_DEBUG "rate_control_lowest_rate - no supported rates "
-               "found\n");
-        return &mode->rates[0];
-}
-
-
 struct global_rate_control {
         int dummy;
 };
@@ -216,56 +198,32 @@ static void rate_control_simple_tx_status(void *priv, struct net_device *dev,
 }
 
 
-static struct ieee80211_rate *
+static void
 rate_control_simple_get_rate(void *priv, struct net_device *dev,
+                             struct ieee80211_hw_mode *mode,
                              struct sk_buff *skb,
-                             struct rate_control_extra *extra)
+                             struct rate_selection *sel)
 {
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct ieee80211_sub_if_data *sdata;
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
-        struct ieee80211_hw_mode *mode = extra->mode;
         struct sta_info *sta;
-        int rateidx, nonerp_idx;
-        u16 fc;
-
-        memset(extra, 0, sizeof(*extra));
-
-        fc = le16_to_cpu(hdr->frame_control);
-        if ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA ||
-            (hdr->addr1[0] & 0x01)) {
-                /* Send management frames and broadcast/multicast data using
-                 * lowest rate. */
-                /* TODO: this could probably be improved.. */
-                return rate_control_lowest_rate(local, mode);
-        }
+        int rateidx;
 
         sta = sta_info_get(local, hdr->addr1);
 
-        if (!sta)
-                return rate_control_lowest_rate(local, mode);
-
-        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-        if (sdata->bss && sdata->bss->force_unicast_rateidx > -1)
-                sta->txrate = sdata->bss->force_unicast_rateidx;
+        if (!sta) {
+                sel->rate = rate_lowest(local, mode, NULL);
+                return;
+        }
 
         rateidx = sta->txrate;
 
         if (rateidx >= mode->num_rates)
                 rateidx = mode->num_rates - 1;
 
-        sta->last_txrate = rateidx;
-        nonerp_idx = rateidx;
-        while (nonerp_idx > 0 &&
-               ((mode->rates[nonerp_idx].flags & IEEE80211_RATE_ERP) ||
-                !(mode->rates[nonerp_idx].flags & IEEE80211_RATE_SUPPORTED) ||
-                !(sta->supp_rates & BIT(nonerp_idx))))
-                nonerp_idx--;
-        extra->nonerp = &mode->rates[nonerp_idx];
-
         sta_info_put(sta);
 
-        return &mode->rates[rateidx];
+        sel->rate = &mode->rates[rateidx];
 }