add git checkout support

[openwrt/openwrt.git] / package / mac80211 / src / mac80211 / rc80211_simple.c

diff --git a/package/mac80211/src/mac80211/rc80211_simple.c b/package/mac80211/src/mac80211/rc80211_simple.c
index 5ae7fc45466547cddb6009abe8f04162f4c0287c..ef91ce428acaafaede5a9d0fd6f3609984152c59 100644 (file)
--- a/package/mac80211/src/mac80211/rc80211_simple.c
+++ b/package/mac80211/src/mac80211/rc80211_simple.c
@@ -147,14 +147,6 @@ static void rate_control_simple_tx_status(void *priv, struct net_device *dev,
        srctrl = sta->rate_ctrl_priv;
        srctrl->tx_num_xmit++;
        if (status->excessive_retries) {
-               sta->antenna_sel_tx = sta->antenna_sel_tx == 1 ? 2 : 1;
-               sta->antenna_sel_rx = sta->antenna_sel_rx == 1 ? 2 : 1;
-               if (local->sta_antenna_sel == STA_ANTENNA_SEL_SW_CTRL_DEBUG) {
-                       printk(KERN_DEBUG "%s: " MAC_FMT " TX antenna --> %d "
-                              "RX antenna --> %d (@%lu)\n",
-                              dev->name, MAC_ARG(hdr->addr1),
-                              sta->antenna_sel_tx, sta->antenna_sel_rx, jiffies);
-               }
                srctrl->tx_num_failures++;
                sta->tx_retry_failed++;
                sta->tx_num_consecutive_failures++;
@@ -187,9 +179,13 @@ static void rate_control_simple_tx_status(void *priv, struct net_device *dev,
                }
 #endif
 
-               if (per_failed > local->rate_ctrl_num_down) {
+               /*
+                * XXX: Make these configurable once we have an
+                * interface to the rate control algorithms
+                */
+               if (per_failed > RATE_CONTROL_NUM_DOWN) {
                        rate_control_rate_dec(local, sta);
-               } else if (per_failed < local->rate_ctrl_num_up) {
+               } else if (per_failed < RATE_CONTROL_NUM_UP) {
                        rate_control_rate_inc(local, sta);
                }
                srctrl->tx_avg_rate_sum += status->control.rate->rate;
@@ -427,7 +423,7 @@ static void __exit rate_control_simple_exit(void)
 }
 
 
-module_init(rate_control_simple_init);
+subsys_initcall(rate_control_simple_init);
 module_exit(rate_control_simple_exit);
 
 MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211");