diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-03-03 12:49:52 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-06 16:35:54 +0100 |
| commit | 098b8afbf23502041c091463aea10a91b735c4cf (patch) | |
| tree | de0945308ca9f74779cf205dc3f6acb797008b27 /net | |
| parent | 965237ab9f6ab573e0b7574e8ce5cc6aa27d17d4 (diff) | |
| download | linux-3.10-098b8afbf23502041c091463aea10a91b735c4cf.tar.gz linux-3.10-098b8afbf23502041c091463aea10a91b735c4cf.tar.bz2 linux-3.10-098b8afbf23502041c091463aea10a91b735c4cf.zip | |
mac80211/minstrel_ht: fix spacing between sample attempts
A sample attempt should only count in mi->sample_tries if the sample
attempt wasn't skipped based on slower rate criteria.
This patch increases the sampling frequency for potentially desirable
rates and thus enables faster recovery from interference or collisions.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rc80211_minstrel_ht.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 1b69924143d..da4ec73f341 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -640,7 +640,6 @@ minstrel_get_sample_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi) if (!mi->sample_tries) return -1; - mi->sample_tries--; mg = &mi->groups[mi->sample_group]; sample_idx = sample_table[mg->column][mg->index]; mr = &mg->rates[sample_idx]; @@ -677,6 +676,7 @@ minstrel_get_sample_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi) if (mi->sample_slow++ > 2) return -1; } + mi->sample_tries--; return sample_idx; } |