Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[~andy/linux] / net / mac80211 / rc80211_minstrel_ht.c

diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index f9e51ef8dfa2432ec44168feebc82579f3ac0be6..fb1d4aa65e8c9e68b347e292a583081ac07c50c5 100644 (file)
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -626,8 +626,12 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
 
 #ifdef CONFIG_MAC80211_DEBUGFS
        /* use fixed index if set */
-       if (mp->fixed_rate_idx != -1)
-               sample_idx = mp->fixed_rate_idx;
+       if (mp->fixed_rate_idx != -1) {
+               mi->max_tp_rate = mp->fixed_rate_idx;
+               mi->max_tp_rate2 = mp->fixed_rate_idx;
+               mi->max_prob_rate = mp->fixed_rate_idx;
+               sample_idx = -1;
+       }
 #endif
 
        if (sample_idx >= 0) {