projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.1' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
net
/
mac80211
/
rc80211_minstrel_ht.c
diff --git
a/net/mac80211/rc80211_minstrel_ht.c
b/net/mac80211/rc80211_minstrel_ht.c
index 333b5118be6d54472e349bbce059a13eda5f418b..66a1eeb279c697f1fc11f0bc0ef17f5fbcd0d40b 100644
(file)
--- a/
net/mac80211/rc80211_minstrel_ht.c
+++ b/
net/mac80211/rc80211_minstrel_ht.c
@@
-609,6
+609,13
@@
minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
info->flags |= mi->tx_flags;
sample_idx = minstrel_get_sample_rate(mp, mi);
info->flags |= mi->tx_flags;
sample_idx = minstrel_get_sample_rate(mp, mi);
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+ /* use fixed index if set */
+ if (mp->fixed_rate_idx != -1)
+ sample_idx = mp->fixed_rate_idx;
+#endif
+
if (sample_idx >= 0) {
sample = true;
minstrel_ht_set_rate(mp, mi, &ar[0], sample_idx,
if (sample_idx >= 0) {
sample = true;
minstrel_ht_set_rate(mp, mi, &ar[0], sample_idx,