summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2008-11-16 17:09:25 -0600
committerJohn W. Linville <linville@tuxdriver.com>2008-11-26 09:47:20 -0500
commit1dc5a84166d83c892cbf192cad58ebdde95d3ac4 (patch)
tree71ca466cd49ad453656145fc46619ae80d413821
parentd507748ac6de67369e76058a8a921cd22734f40a (diff)
downloadlinux-1dc5a84166d83c892cbf192cad58ebdde95d3ac4.tar.gz
linux-1dc5a84166d83c892cbf192cad58ebdde95d3ac4.tar.bz2
linux-1dc5a84166d83c892cbf192cad58ebdde95d3ac4.zip
mac80211: Fix pid rate-setting algorithm to allow rate changes
In commit 9ea2c74 named "mac80211/drivers: rewrite the rate control API", the meaning of status.rates[i].count was changed from number of retries to total number of tries. As a result, the pid rate-setting algorithm fails because every packet appears to have needed a retransmit. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/rc80211_pid_algo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rc80211_pid_algo.c b/net/mac80211/rc80211_pid_algo.c
index 96ceb7e86c5c..b16801cde06f 100644
--- a/net/mac80211/rc80211_pid_algo.c
+++ b/net/mac80211/rc80211_pid_algo.c
@@ -256,7 +256,7 @@ static void rate_control_pid_tx_status(void *priv, struct ieee80211_supported_ba
if (!(info->flags & IEEE80211_TX_STAT_ACK)) {
spinfo->tx_num_failed += 2;
spinfo->tx_num_xmit++;
- } else if (info->status.rates[0].count) {
+ } else if (info->status.rates[0].count > 1) {
spinfo->tx_num_failed++;
spinfo->tx_num_xmit++;
}