Upgrade b43 and mac80211.

[openwrt/staging/lynxis/omap.git] / package / mac80211 / src / net / mac80211 / ieee80211_rate.c

diff --git a/package/mac80211/src/net/mac80211/ieee80211_rate.c b/package/mac80211/src/net/mac80211/ieee80211_rate.c
index 93abb8fff1410f254c9fb6adf04ad34823bc80a5..ebe29b716b271a8124d5460750b3a5f8d1a349e0 100644 (file)
--- a/package/mac80211/src/net/mac80211/ieee80211_rate.c
+++ b/package/mac80211/src/net/mac80211/ieee80211_rate.c
@@ -21,17 +21,35 @@ struct rate_control_alg {
 static LIST_HEAD(rate_ctrl_algs);
 static DEFINE_MUTEX(rate_ctrl_mutex);
 
+static char *ieee80211_default_rc_algo = CONFIG_MAC80211_RC_DEFAULT;
+module_param(ieee80211_default_rc_algo, charp, 0644);
+MODULE_PARM_DESC(ieee80211_default_rc_algo,
+                "Default rate control algorithm for mac80211 to use");
+
 int ieee80211_rate_control_register(struct rate_control_ops *ops)
 {
        struct rate_control_alg *alg;
 
+       if (!ops->name)
+               return -EINVAL;
+
+       mutex_lock(&rate_ctrl_mutex);
+       list_for_each_entry(alg, &rate_ctrl_algs, list) {
+               if (!strcmp(alg->ops->name, ops->name)) {
+                       /* don't register an algorithm twice */
+                       WARN_ON(1);
+                       mutex_unlock(&rate_ctrl_mutex);
+                       return -EALREADY;
+               }
+       }
+
        alg = kzalloc(sizeof(*alg), GFP_KERNEL);
        if (alg == NULL) {
+               mutex_unlock(&rate_ctrl_mutex);
                return -ENOMEM;
        }
        alg->ops = ops;
 
-       mutex_lock(&rate_ctrl_mutex);
        list_add_tail(&alg->list, &rate_ctrl_algs);
        mutex_unlock(&rate_ctrl_mutex);
 
@@ -47,11 +65,11 @@ void ieee80211_rate_control_unregister(struct rate_control_ops *ops)
        list_for_each_entry(alg, &rate_ctrl_algs, list) {
                if (alg->ops == ops) {
                        list_del(&alg->list);
+                       kfree(alg);
                        break;
                }
        }
        mutex_unlock(&rate_ctrl_mutex);
-       kfree(alg);
 }
 EXPORT_SYMBOL(ieee80211_rate_control_unregister);
 
@@ -61,9 +79,12 @@ ieee80211_try_rate_control_ops_get(const char *name)
        struct rate_control_alg *alg;
        struct rate_control_ops *ops = NULL;
 
+       if (!name)
+               return NULL;
+
        mutex_lock(&rate_ctrl_mutex);
        list_for_each_entry(alg, &rate_ctrl_algs, list) {
-               if (!name || !strcmp(alg->ops->name, name))
+               if (!strcmp(alg->ops->name, name))
                        if (try_module_get(alg->ops->module)) {
                                ops = alg->ops;
                                break;
@@ -73,18 +94,31 @@ ieee80211_try_rate_control_ops_get(const char *name)
        return ops;
 }
 
-/* Get the rate control algorithm. If `name' is NULL, get the first
- * available algorithm. */
+/* Get the rate control algorithm. */
 static struct rate_control_ops *
 ieee80211_rate_control_ops_get(const char *name)
 {
        struct rate_control_ops *ops;
+       const char *alg_name;
 
-       ops = ieee80211_try_rate_control_ops_get(name);
+       if (!name)
+               alg_name = ieee80211_default_rc_algo;
+       else
+               alg_name = name;
+
+       ops = ieee80211_try_rate_control_ops_get(alg_name);
        if (!ops) {
-               request_module("rc80211_%s", name ? name : "default");
-               ops = ieee80211_try_rate_control_ops_get(name);
+               request_module("rc80211_%s", alg_name);
+               ops = ieee80211_try_rate_control_ops_get(alg_name);
        }
+       if (!ops && name)
+               /* try default if specific alg requested but not found */
+               ops = ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);
+
+       /* try built-in one if specific alg requested but not found */
+       if (!ops && strlen(CONFIG_MAC80211_RC_DEFAULT))
+               ops = ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);
+
        return ops;
 }
 
@@ -128,6 +162,38 @@ static void rate_control_release(struct kref *kref)
        kfree(ctrl_ref);
 }
 
+void rate_control_get_rate(struct net_device *dev,
+                          struct ieee80211_supported_band *sband,
+                          struct sk_buff *skb,
+                          struct rate_selection *sel)
+{
+       struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+       struct rate_control_ref *ref = local->rate_ctrl;
+       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+       struct sta_info *sta = sta_info_get(local, hdr->addr1);
+       int i;
+
+       memset(sel, 0, sizeof(struct rate_selection));
+
+       ref->ops->get_rate(ref->priv, dev, sband, skb, sel);
+
+       /* Select a non-ERP backup rate. */
+       if (!sel->nonerp) {
+               for (i = 0; i < sband->n_bitrates; i++) {
+                       struct ieee80211_rate *rate = &sband->bitrates[i];
+                       if (sel->rate->bitrate < rate->bitrate)
+                               break;
+
+                       if (rate_supported(sta, sband->band, i) &&
+                           !(rate->flags & IEEE80211_RATE_ERP_G))
+                               sel->nonerp = rate;
+               }
+       }
+
+       if (sta)
+               sta_info_put(sta);
+}
+
 struct rate_control_ref *rate_control_get(struct rate_control_ref *ref)
 {
        kref_get(&ref->kref);
@@ -178,3 +244,4 @@ void rate_control_deinitialize(struct ieee80211_local *local)
        local->rate_ctrl = NULL;
        rate_control_put(ref);
 }
+