---

yaml --- r: 291535 b: refs/heads/master c: ba6fa29 h: refs/heads/master i: 291533: 783f577 291531: e53d60e 291527: 72f29de 291519: d65bffe v: v3
git-mirror · Mar 15, 2012 · 37c2510 · 37c2510
1 parent 64f51ca
commit 37c2510
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d9be8a4b7da71ef3b4ac8f6aa4fa225c1cb8e98
+refs/heads/master: ba6fa29c6dd51a1245a109f4b460092b51cad0f0
diff --git a/trunk/net/mac80211/rc80211_minstrel_ht.c b/trunk/net/mac80211/rc80211_minstrel_ht.c
@@ -567,6 +567,13 @@ minstrel_get_sample_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
 	sample_idx += mi->sample_group * MCS_GROUP_RATES;
 	minstrel_next_sample_idx(mi);
 
+	/*
+	 * Sampling might add some overhead (RTS, no aggregation)
+	 * to the frame. Hence, don't use sampling for the currently
+	 * used max TP rate.
+	 */
+	if (sample_idx == mi->max_tp_rate)
+		return -1;
 	/*
 	 * When not using MRR, do not sample if the probability is already
 	 * higher than 95% to avoid wasting airtime