diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-14 18:58:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-14 18:58:49 -0700 |
| commit | cf3842ec5015c862f4869e3641a8549393bb958e (patch) | |
| tree | 6c2f0158504f3463fcca1359de90b699cb636e97 /net/mac80211/rc80211_simple.c | |
| parent | b3b0b681b12478a7afa7d1f3d58be96830e16c7d (diff) | |
| parent | 63fc33ceb0ccc08b3f62d7bfe56a33eb33ca9427 (diff) | |
| download | op-kernel-dev-cf3842ec5015c862f4869e3641a8549393bb958e.zip op-kernel-dev-cf3842ec5015c862f4869e3641a8549393bb958e.tar.gz | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/rc80211_simple.c')
| -rw-r--r-- | net/mac80211/rc80211_simple.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/mac80211/rc80211_simple.c b/net/mac80211/rc80211_simple.c index 5ae7fc4..f6780d6 100644 --- a/net/mac80211/rc80211_simple.c +++ b/net/mac80211/rc80211_simple.c @@ -187,9 +187,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; |
