minstrel_ht: fix updating rate with best probability

The throughput should be considered when updating rate
with best probability.

Signed-off-by: Ming Lei <[email protected]>
Acked-by: Felix Fietkau <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index 52c85036660d4d1cd51c431700ccaff428a0329f..8fba6f4c514593d05458734e158fcdf52bb18283 100644 (file)
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -240,6 +240,7 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
                             MINSTREL_FRAC(3, 4)) || mr->probability > cur_prob) {
                                mg->max_prob_rate = index;
                                cur_prob = mr->probability;
+                               cur_prob_tp = mr->cur_tp;
                        }
 
                        if (mr->cur_tp > cur_tp) {
@@ -275,6 +276,7 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
                    minstrel_mcs_groups[group].streams == 1) {
                        mi->max_prob_rate = mg->max_prob_rate;
                        cur_prob = mr->cur_prob;
+                       cur_prob_tp = mr->cur_tp;
                }
 
                mr = minstrel_get_ratestats(mi, mg->max_tp_rate);