Skip to contentSkip to conversation

iwlegacy: fix rate control regression

PATCH In review Jonghwan Choi 2 participants 2 messages Jun 27, 2013 – Jun 28, 2013 Stable branch

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iwlegacy: fix rate control regression

This patch looks like it should be in the 3.9-stable tree, should we apply it?

------------------

From: "Stanislaw Gruszka <[email protected]>"

commit a8cf0194b7187fb65dfff28a1c5153d442e3836a upstream

Since driver does not use control.rates[0].count, we have never set that variable. But currently, after rate control API rewrite, this is required by mac80211. Otherwise legacy rates control does not work and we transmit always at 1Mbit/s on pre 11n networks.

---
 drivers/net/wireless/iwlegacy/3945-rs.c |    1 +
 drivers/net/wireless/iwlegacy/4965-rs.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/net/wireless/iwlegacy/3945-rs.c
index d4fd29a..dde7ff0 100644

drivers/net/wireless/iwlegacy/3945-rs.c +1 -0
@@ -816,6 +816,7 @@ out:
 		rs_sta->last_txrate_idx = idx;
 		info->control.rates[0].idx = rs_sta->last_txrate_idx;
 	}
+	info->control.rates[0].count = 1;
 
 	D_RATE("leave: %d\n", idx);
 }
(quoted diff) +0 -0

b/drivers/net/wireless/iwlegacy/4965-rs.c
index 6c7493c..38fb9e1 100644

drivers/net/wireless/iwlegacy/4965-rs.c +0 -0
@@ -2268,7 +2268,7 @@ il4965_rs_get_rate(void *il_r, struct ieee80211_sta

*sta, void *il_sta,
info->control.rates[0].flags = 0;
}
info->control.rates[0].idx = rate_idx;
-
+ info->control.rates[0].count = 1;
}

static void *

Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 2 lines · Jonghwan Choi

This patch looks like it should be in the 3.9-stable tree, should we apply it?

No, this regression is caused by

commit 0d528d85c519b755b6f4e1bafa3a39984370e1c1

Author: Felix Fietkau <[email protected]>
Date:   Mon Apr 22 16:14:41 2013 +0200

mac80211: improve the rate control API

which first appear on 3.10-rc2. Sorry for not specifying that information in the ChangeLog.

Stanislaw