From 37c251024222c6e4badbcc4372db8144c3635baf Mon Sep 17 00:00:00 2001 From: Helmut Schaa Date: Wed, 14 Mar 2012 13:31:11 +0100 Subject: [PATCH] --- yaml --- r: 291535 b: refs/heads/master c: ba6fa29c6dd51a1245a109f4b460092b51cad0f0 h: refs/heads/master i: 291533: 783f5770cc0b3ec3f02cf11e50809f75a035e8b4 291531: e53d60ebe5bbe58dedeaf27b101699c5a8e05e3a 291527: 72f29deeee412a26a8d5f1fce1a66f253171e340 291519: d65bffea87ca361583d5ca5ebe588a714b837d37 v: v3 --- [refs] | 2 +- trunk/net/mac80211/rc80211_minstrel_ht.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 73c9c6d5ed08..145eabb44889 100644 --- 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 index 2b42564d6e29..16e0b277b9a8 100644 --- 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