From 6be0b74393c2aa3220d40f6f59794b4467e76298 Mon Sep 17 00:00:00 2001 From: Helmut Schaa Date: Mon, 1 Aug 2011 11:32:53 +0200 Subject: [PATCH] --- yaml --- r: 265431 b: refs/heads/master c: 6de062ced91d894936edc54d79158b9f69f85d0e h: refs/heads/master i: 265429: fb818ff3d6840c62b3d8bf1e3f558fdfd9cd62aa 265427: 1f2cfc5919c45c953dc8fd9e01616ba8c03afd88 265423: 9b768123e57f1f8d34f0eed4812d71f673064ff2 v: v3 --- [refs] | 2 +- trunk/net/mac80211/rc80211_minstrel_ht.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 470a01632db8..1548bb9ea3ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f75f5c6f61b4d34bf92625fcd1131dd58921e1b5 +refs/heads/master: 6de062ced91d894936edc54d79158b9f69f85d0e diff --git a/trunk/net/mac80211/rc80211_minstrel_ht.c b/trunk/net/mac80211/rc80211_minstrel_ht.c index 66a1eeb279c6..21588386a302 100644 --- a/trunk/net/mac80211/rc80211_minstrel_ht.c +++ b/trunk/net/mac80211/rc80211_minstrel_ht.c @@ -608,7 +608,13 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta, return mac80211_minstrel.get_rate(priv, sta, &msp->legacy, txrc); info->flags |= mi->tx_flags; - sample_idx = minstrel_get_sample_rate(mp, mi); + + /* Don't use EAPOL frames for sampling on non-mrr hw */ + if (mp->hw->max_rates == 1 && + txrc->skb->protocol == cpu_to_be16(ETH_P_PAE)) + sample_idx = -1; + else + sample_idx = minstrel_get_sample_rate(mp, mi); #ifdef CONFIG_MAC80211_DEBUGFS /* use fixed index if set */