From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Sun, 16 Nov 2008 23:09:25 +0000 (-0600)
Subject: mac80211: Fix pid rate-setting algorithm to allow rate changes
X-Git-Tag: v2.6.29-rc1~581^2~383^2~44
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1dc5a84166d83c892cbf192cad58ebdde95d3ac4;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/net/mac80211/rc80211_pid_algo.c b/net/mac80211/rc80211_pid_algo.c
index 96ceb7e86c5..b16801cde06 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++;
 	}