[openwrt/openwrt] mac80211: add a missing check to the last minstrel fix

[LEDE Commits]

nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/1f427bd6166afa2aa11384fa559be9459397a0fe

commit 1f427bd6166afa2aa11384fa559be9459397a0fe
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Thu Mar 1 14:43:56 2018 +0100

    mac80211: add a missing check to the last minstrel fix
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 .../337-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/kernel/mac80211/patches/337-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch b/package/kernel/mac80211/patches/337-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch
index ff2f345..e0049c3 100644
--- a/package/kernel/mac80211/patches/337-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch
+++ b/package/kernel/mac80211/patches/337-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch
@@ -29,13 +29,14 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
  			idx += 4;
  	}
  	return &mi->groups[group].rates[idx];
-@@ -1080,18 +1081,22 @@ minstrel_ht_get_rate(void *priv, struct
+@@ -1080,18 +1081,23 @@ minstrel_ht_get_rate(void *priv, struct
  		return;
  
  	sample_group = &minstrel_mcs_groups[sample_idx / MCS_GROUP_RATES];
 +	sample_idx %= MCS_GROUP_RATES;
 +
-+	if ((sample_idx >= 4) != txrc->short_preamble)
++	if (sample_group == &minstrel_mcs_groups[MINSTREL_CCK_GROUP] &&
++	    (sample_idx >= 4) != txrc->short_preamble)
 +		return;
 +
  	info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;