[PATCH v3] minstrel_ht: enable frame aggregation for fixed rate

[PATCH v3] minstrel_ht: enable frame aggregation for fixed rate

[Sylvain Roger Rieunier]

When sample_idx is set to a value other than -1, it activates
IEEE80211_TX_CTL_RATE_CTRL_PROBE flag. but this flag Disabled frame
aggregation. to allow frame aggregation during fixed rate it is necessary to
set max_tp_rate, max_tp_rate2, max_prob_rate instead of sample_idx.

Signed-off-by: Sylvain Roger Rieunier <sylvain.roger.rieunier@gmail.com>
---
 net/mac80211/rc80211_minstrel_ht.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index f9e51ef..fb1d4aa 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -626,8 +626,12 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
 
 #ifdef CONFIG_MAC80211_DEBUGFS
 	/* use fixed index if set */
-	if (mp->fixed_rate_idx != -1)
-		sample_idx = mp->fixed_rate_idx;
+	if (mp->fixed_rate_idx != -1) {
+		mi->max_tp_rate = mp->fixed_rate_idx;
+		mi->max_tp_rate2 = mp->fixed_rate_idx;
+		mi->max_prob_rate = mp->fixed_rate_idx;
+		sample_idx = -1;
+	}
 #endif
 
 	if (sample_idx >= 0) {
-- 
1.7.9.5

Re: [PATCH v3] minstrel_ht: enable frame aggregation for fixed rate

[Johannes Berg]

On Mon, 2012-07-09 at 19:25 +0200, Sylvain Roger Rieunier wrote:
> When sample_idx is set to a value other than -1, it activates
> IEEE80211_TX_CTL_RATE_CTRL_PROBE flag. but this flag Disabled frame
> aggregation. to allow frame aggregation during fixed rate it is necessary to
> set max_tp_rate, max_tp_rate2, max_prob_rate instead of sample_idx.
> 
> Signed-off-by: Sylvain Roger Rieunier <sylvain.roger.rieunier@gmail.com>

Applied.

johannes