diff options
| author | Felix Fietkau <nbd@nbd.name> | 2021-01-15 13:02:39 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2021-01-22 09:11:37 +0100 |
| commit | 019c6fc2782998fbaa0bdca578e26f7823a11cf2 (patch) | |
| tree | 3869619ba8b6846d7666f68486cbeeabcf56c56c /net/mac80211/rc80211_minstrel_ht.c | |
| parent | 1ae8bba9a23b6cc9efbd9b4ca485ed057d5639a6 (diff) | |
mac80211: minstrel_ht: improve sample rate selection
Always allow sampling of rates faster than the primary max throughput rate.
When the second max_tp_rate is higher than the first one, sample attempts were
previously skipped, potentially causing rate control to get stuck at a slightly
lower rate
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20210115120242.89616-7-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rc80211_minstrel_ht.c')
| -rw-r--r-- | net/mac80211/rc80211_minstrel_ht.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 8b2376898ec8..aa71a58d4431 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -1379,13 +1379,13 @@ minstrel_get_sample_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi) mrs = &mg->rates[sample_idx]; sample_idx += sample_group * MCS_GROUP_RATES; - /* Set tp_rate1, tp_rate2 to the highest / second highest max_tp_rate */ + tp_rate1 = mi->max_tp_rate[0]; + + /* Set tp_rate2 to the second highest max_tp_rate */ if (minstrel_get_duration(mi->max_tp_rate[0]) > minstrel_get_duration(mi->max_tp_rate[1])) { - tp_rate1 = mi->max_tp_rate[1]; tp_rate2 = mi->max_tp_rate[0]; } else { - tp_rate1 = mi->max_tp_rate[0]; tp_rate2 = mi->max_tp_rate[1]; } |