korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 08:14:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

cfg80211: add VHT rate entries for MCS-10 and MCS-11

Browse Source 
Observed the warning in cfg80211_calculate_bitrate_vht() using an
11ac chip reporting MCS-11. Since devices reporting non-standard
MCS-9 is already supported add similar entries for MCS-10 and MCS-11.
Actually, the value of MCS-9@20MHz is slightly off so corrected that.

Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Link: https://lore.kernel.org/r/20210105105839.3795-1-arend.vanspriel@broadcom.com
[fix array size]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Arend van Spriel 2021-01-05 11:58:39 +01:00 committed by Johannes Berg
parent 7f7aa94bca
commit c27aa56a72
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/wireless/util.c
View File

@ -1224,7 +1224,7 @@ static u32 cfg80211_calculate_bitrate_edmg(struct rate_info *rate)
static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate) static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate)
{ {
static const u32 base[4][10] = { static const u32 base[4][12] = {
{ 6500000, { 6500000,
13000000, 13000000,
19500000, 19500000,
@ -1235,7 +1235,9 @@ static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate)
65000000, 65000000,
78000000, 78000000,
/* not in the spec, but some devices use this: */ /* not in the spec, but some devices use this: */
86500000, 86700000,
97500000,
108300000,
}, },
{ 13500000, { 13500000,
27000000, 27000000,
@ -1247,6 +1249,8 @@ static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate)
135000000, 135000000,
162000000, 162000000,
180000000, 180000000,
202500000,
225000000,
}, },
{ 29300000, { 29300000,
58500000, 58500000,
@ -1258,6 +1262,8 @@ static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate)
292500000, 292500000,
351000000, 351000000,
390000000, 390000000,
438800000,
487500000,
}, },
{ 58500000, { 58500000,
117000000, 117000000,
@ -1269,12 +1275,14 @@ static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate)
585000000, 585000000,
702000000, 702000000,
780000000, 780000000,
877500000,
975000000,
}, },
}; };
u32 bitrate; u32 bitrate;
int idx; int idx;
if (rate->mcs > 9) if (rate->mcs > 11)
goto warn; goto warn;
switch (rate->bw) { switch (rate->bw) {