diff options
| author | Felix Fietkau <nbd@nbd.name> | 2018-03-01 14:43:56 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2018-03-01 14:45:11 +0100 |
| commit | 1f427bd6166afa2aa11384fa559be9459397a0fe (patch) | |
| tree | 0b3176b6e53426dbec2472ca66972a9ae00244dd | |
| parent | a186c2ab70d3980d3da502da7e08fb3644104815 (diff) | |
| download | upstream-1f427bd6166afa2aa11384fa559be9459397a0fe.tar.gz upstream-1f427bd6166afa2aa11384fa559be9459397a0fe.tar.bz2 upstream-1f427bd6166afa2aa11384fa559be9459397a0fe.zip | |
mac80211: add a missing check to the last minstrel fix
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | package/kernel/mac80211/patches/337-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch | 5 |
1 files 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 ff2f3450b2..e0049c36eb 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@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; |