diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-07-12 21:21:05 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-12 21:21:05 +0200 |
| commit | d07d152892aadd8dc3209ecef6788dfc83475676 (patch) | |
| tree | 0f140aa244ddc2c52494155342298cef64fc8456 /net/mac80211/rc80211_minstrel_ht.c | |
| parent | ath5k: replace modparam_all_channels with CONFIG_ATH5K_TEST_CHANNELS (diff) | |
| parent | mac80211: iterate the virtual monitor interface (diff) | |
| download | linux-d07d152892aadd8dc3209ecef6788dfc83475676.tar.xz linux-d07d152892aadd8dc3209ecef6788dfc83475676.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/iwmc3200wifi/cfg80211.c
drivers/net/wireless/mwifiex/cfg80211.c
Diffstat (limited to 'net/mac80211/rc80211_minstrel_ht.c')
| -rw-r--r-- | net/mac80211/rc80211_minstrel_ht.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index f9e51ef8dfa2..fb1d4aa65e8c 100644 --- 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) { |