Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73b16589 authored by Felix Fietkau's avatar Felix Fietkau Committed by Johannes Berg
Browse files

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: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 4cae4cd1

net/mac80211/rc80211_minstrel_ht.c

+0 −20
Original line number Diff line number Diff line
@@ -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 CONFIG_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;