From: Thomas Huehn <thomas.huehn@evernet-eg.de>
Date: Wed, 14 Dec 2016 19:47:03 +0000 (+0100)
Subject: mac80211: minstrel: avoid port control frames for sampling
X-Git-Tag: v4.11-rc1~124^2~420^2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38252e9ef68936f104a5791740f4ca2f81510a33;p=platform%2Fkernel%2Flinux-exynos.git

mac80211: minstrel: avoid port control frames for sampling

Makes connections more reliable

Signed-off-by: Thomas Huehn <thomas.huehn@evernet-eg.de>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c
index 11a4cc3..3ebe440 100644
--- a/net/mac80211/rc80211_minstrel.c
+++ b/net/mac80211/rc80211_minstrel.c
@@ -367,6 +367,11 @@ minstrel_get_rate(void *priv, struct ieee80211_sta *sta,
 		return;
 #endif
 
+	/* Don't use EAPOL frames for sampling on non-mrr hw */
+	if (mp->hw->max_rates == 1 &&
+	    (info->control.flags & IEEE80211_TX_CTRL_PORT_CTRL_PROTO))
+		return;
+
 	delta = (mi->total_packets * sampling_ratio / 100) -
 			(mi->sample_packets + mi->sample_deferred / 2);