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

Commit 7f2e12e1 authored by Felix Fietkau's avatar Felix Fietkau Committed by Johannes Berg
Browse files

mac80211: minstrel_ht: add support for rates with 4 spatial streams 



This is needed for the upcoming driver for MT7615 4x4 802.11ac chipsets

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1974da8b

net/mac80211/rc80211_minstrel_ht.c

+10 −0
Original line number Diff line number Diff line
@@ -157,44 +157,54 @@ const struct mcs_group minstrel_mcs_groups[] = { 
	MCS_GROUP(1, 0, BW_20, 5),

	MCS_GROUP(2, 0, BW_20, 4),

	MCS_GROUP(3, 0, BW_20, 4),

	MCS_GROUP(4, 0, BW_20, 4),



	MCS_GROUP(1, 1, BW_20, 5),

	MCS_GROUP(2, 1, BW_20, 4),

	MCS_GROUP(3, 1, BW_20, 4),

	MCS_GROUP(4, 1, BW_20, 4),



	MCS_GROUP(1, 0, BW_40, 4),

	MCS_GROUP(2, 0, BW_40, 4),

	MCS_GROUP(3, 0, BW_40, 4),

	MCS_GROUP(4, 0, BW_40, 4),



	MCS_GROUP(1, 1, BW_40, 4),

	MCS_GROUP(2, 1, BW_40, 4),

	MCS_GROUP(3, 1, BW_40, 4),

	MCS_GROUP(4, 1, BW_40, 4),



	CCK_GROUP(8),



	VHT_GROUP(1, 0, BW_20, 5),

	VHT_GROUP(2, 0, BW_20, 4),

	VHT_GROUP(3, 0, BW_20, 4),

	VHT_GROUP(4, 0, BW_20, 4),



	VHT_GROUP(1, 1, BW_20, 5),

	VHT_GROUP(2, 1, BW_20, 4),

	VHT_GROUP(3, 1, BW_20, 4),

	VHT_GROUP(4, 1, BW_20, 4),



	VHT_GROUP(1, 0, BW_40, 4),

	VHT_GROUP(2, 0, BW_40, 4),

	VHT_GROUP(3, 0, BW_40, 4),

	VHT_GROUP(4, 0, BW_40, 3),



	VHT_GROUP(1, 1, BW_40, 4),

	VHT_GROUP(2, 1, BW_40, 4),

	VHT_GROUP(3, 1, BW_40, 4),

	VHT_GROUP(4, 1, BW_40, 3),



	VHT_GROUP(1, 0, BW_80, 4),

	VHT_GROUP(2, 0, BW_80, 4),

	VHT_GROUP(3, 0, BW_80, 4),

	VHT_GROUP(4, 0, BW_80, 2),



	VHT_GROUP(1, 1, BW_80, 4),

	VHT_GROUP(2, 1, BW_80, 4),

	VHT_GROUP(3, 1, BW_80, 4),

	VHT_GROUP(4, 1, BW_80, 2),

};



static u8 sample_table[SAMPLE_COLUMNS][MCS_GROUP_RATES] __read_mostly;

net/mac80211/rc80211_minstrel_ht.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * The number of streams can be changed to 2 to reduce code

 * size and memory footprint.

 */

#define MINSTREL_MAX_STREAMS		3

#define MINSTREL_MAX_STREAMS		4

#define MINSTREL_HT_STREAM_GROUPS	4 /* BW(=2) * SGI(=2) */

#define MINSTREL_VHT_STREAM_GROUPS	6 /* BW(=3) * SGI(=2) */