diff options
author | Felix Fietkau <nbd@nbd.name> | 2016-12-15 11:48:12 +0100 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2016-12-19 13:51:21 +0100 |
commit | 00bc7f0357d082e73699fb561776088e48e53101 (patch) | |
tree | 92396001e5678f24e207464bd83fe63e8b5caaca /package/kernel/mac80211/patches/342-mac80211-minstrel_ht-remove-obsolete-if-for-3-stream.patch | |
parent | 6f77b8d510e2308f85344cd46de96dadc07a6cb9 (diff) | |
download | upstream-00bc7f0357d082e73699fb561776088e48e53101.tar.gz upstream-00bc7f0357d082e73699fb561776088e48e53101.tar.bz2 upstream-00bc7f0357d082e73699fb561776088e48e53101.zip |
mac80211: merge a number of minstrel/minstrel_ht performance and memory usage improvements
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/342-mac80211-minstrel_ht-remove-obsolete-if-for-3-stream.patch')
-rw-r--r-- | package/kernel/mac80211/patches/342-mac80211-minstrel_ht-remove-obsolete-if-for-3-stream.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/342-mac80211-minstrel_ht-remove-obsolete-if-for-3-stream.patch b/package/kernel/mac80211/patches/342-mac80211-minstrel_ht-remove-obsolete-if-for-3-stream.patch new file mode 100644 index 0000000000..39d3c99e74 --- /dev/null +++ b/package/kernel/mac80211/patches/342-mac80211-minstrel_ht-remove-obsolete-if-for-3-stream.patch @@ -0,0 +1,80 @@ +From: Felix Fietkau <nbd@nbd.name> +Date: Wed, 14 Dec 2016 20:23:29 +0100 +Subject: [PATCH] mac80211: minstrel_ht: remove obsolete #if for >= 3 streams + +This was added during early development when 3x3 hardware was not very +common yet. This is completely unnecessary now. + +Signed-off-by: Felix Fietkau <nbd@nbd.name> +--- + +--- a/net/mac80211/rc80211_minstrel_ht.c ++++ b/net/mac80211/rc80211_minstrel_ht.c +@@ -155,67 +155,47 @@ MODULE_PARM_DESC(minstrel_vht_only, + const struct mcs_group minstrel_mcs_groups[] = { + MCS_GROUP(1, 0, BW_20), + MCS_GROUP(2, 0, BW_20), +-#if MINSTREL_MAX_STREAMS >= 3 + MCS_GROUP(3, 0, BW_20), +-#endif + + MCS_GROUP(1, 1, BW_20), + MCS_GROUP(2, 1, BW_20), +-#if MINSTREL_MAX_STREAMS >= 3 + MCS_GROUP(3, 1, BW_20), +-#endif + + MCS_GROUP(1, 0, BW_40), + MCS_GROUP(2, 0, BW_40), +-#if MINSTREL_MAX_STREAMS >= 3 + MCS_GROUP(3, 0, BW_40), +-#endif + + MCS_GROUP(1, 1, BW_40), + MCS_GROUP(2, 1, BW_40), +-#if MINSTREL_MAX_STREAMS >= 3 + MCS_GROUP(3, 1, BW_40), +-#endif + + CCK_GROUP, + + #ifdef CPTCFG_MAC80211_RC_MINSTREL_VHT + VHT_GROUP(1, 0, BW_20), + VHT_GROUP(2, 0, BW_20), +-#if MINSTREL_MAX_STREAMS >= 3 + VHT_GROUP(3, 0, BW_20), +-#endif + + VHT_GROUP(1, 1, BW_20), + VHT_GROUP(2, 1, BW_20), +-#if MINSTREL_MAX_STREAMS >= 3 + VHT_GROUP(3, 1, BW_20), +-#endif + + VHT_GROUP(1, 0, BW_40), + VHT_GROUP(2, 0, BW_40), +-#if MINSTREL_MAX_STREAMS >= 3 + VHT_GROUP(3, 0, BW_40), +-#endif + + VHT_GROUP(1, 1, BW_40), + VHT_GROUP(2, 1, BW_40), +-#if MINSTREL_MAX_STREAMS >= 3 + VHT_GROUP(3, 1, BW_40), +-#endif + + VHT_GROUP(1, 0, BW_80), + VHT_GROUP(2, 0, BW_80), +-#if MINSTREL_MAX_STREAMS >= 3 + VHT_GROUP(3, 0, BW_80), +-#endif + + VHT_GROUP(1, 1, BW_80), + VHT_GROUP(2, 1, BW_80), +-#if MINSTREL_MAX_STREAMS >= 3 + VHT_GROUP(3, 1, BW_80), + #endif +-#endif + }; + + static u8 sample_table[SAMPLE_COLUMNS][MCS_GROUP_RATES] __read_mostly; |