[PATCH] mac80211: minstrel_ht should not override user supplied rts setting
From: Marek Lindner <hidden>
Date: 2012-01-28 07:23:11
Subsystem:
mac80211, the rest · Maintainers:
Johannes Berg, Linus Torvalds
Signed-off-by: Marek Lindner <redacted> --- 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 ff5f7b8..9b889d7 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c@@ -644,10 +644,10 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta, false, false); else minstrel_ht_set_rate(mp, mi, &ar[1], mi->max_tp_rate2, - false, true); + false, false); minstrel_ht_set_rate(mp, mi, &ar[2], mi->max_prob_rate, - false, !sample); + false, false); ar[3].count = 0; ar[3].idx = -1;
@@ -658,7 +658,7 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta, * max_tp_rate -> max_prob_rate by default. */ minstrel_ht_set_rate(mp, mi, &ar[1], mi->max_prob_rate, - false, !sample); + false, false); ar[2].count = 0; ar[2].idx = -1;
--
1.7.5.4