|
@@ -89,7 +89,7 @@ static const struct index_eht_data_rate_type eht_mcs_nss1[] = {
|
|
|
{{21618, 20417, 18375}, {0} } } ,
|
|
|
{11, {{1434, 1354, 1219}, {0} },
|
|
|
{{2868, 2708, 2438}, {0} },
|
|
|
- {{6004, 5671, 5104}, {0} },
|
|
|
+ {{6005, 5671, 5104}, {0} },
|
|
|
{{12010, 11342, 10208}, {0} },
|
|
|
{{24020, 22685, 20417}, {0} }} ,
|
|
|
{12, {{1549, 1463, 1316}, {0} },
|
|
@@ -107,72 +107,72 @@ static const struct index_eht_data_rate_type eht_mcs_nss1[] = {
|
|
|
/*MCS parameters with Nss = 2*/
|
|
|
static const struct index_eht_data_rate_type eht_mcs_nss2[] = {
|
|
|
/* MCS, {dcm0:0.8/1.6/3.2}, {dcm1:0.8/1.6/3.2} */
|
|
|
- {0, {{172, 163, 146 }, {0} }, /* EHT20 */
|
|
|
- {{344, 325, 293 }, {0} }, /* EHT40 */
|
|
|
- {{721, 681, 613 }, {0} }, /* EHT80 */
|
|
|
- {{1442, 1362, 1225}, {0} }, /* EHT160 */
|
|
|
+ {0, {{172, 162, 146 }, {0} }, /* EHT20 */
|
|
|
+ {{344, 326, 292 }, {0} }, /* EHT40 */
|
|
|
+ {{720, 680, 612 }, {0} }, /* EHT80 */
|
|
|
+ {{1442, 1362, 1226}, {0} }, /* EHT160 */
|
|
|
{{2882, 2722, 2450}, {0} } } , /* EHT320 */
|
|
|
- {1, {{344, 325, 293 }, {0} },
|
|
|
- {{688, 650, 585 }, {0} },
|
|
|
- {{1441, 1361, 1225}, {0} },
|
|
|
+ {1, {{344, 326, 292 }, {0} },
|
|
|
+ {{688, 650, 586 }, {0} },
|
|
|
+ {{1442, 1362, 1226}, {0} },
|
|
|
{{2882, 2722, 2450}, {0}},
|
|
|
{{5764, 5444, 4900}, {0} }} ,
|
|
|
- {2, {{516, 488, 439 }, {0} },
|
|
|
- {{1032, 975, 878 }, {0} },
|
|
|
+ {2, {{516, 488, 438 }, {0} },
|
|
|
+ {{1032, 976, 878 }, {0} },
|
|
|
{{2162, 2042, 1838}, {0} },
|
|
|
{{4324, 4084, 3676}, {0} },
|
|
|
{{8648, 8166, 7350}, {0} } } ,
|
|
|
- {3, {{688, 650, 585 }, {0} },
|
|
|
+ {3, {{688, 650, 586 }, {0} },
|
|
|
{{1376, 1300, 1170}, {0} },
|
|
|
{{2882, 2722, 2450}, {0} },
|
|
|
{{5764, 5444, 4900}, {0} },
|
|
|
{{11530, 10888, 9800}, {0}} } ,
|
|
|
- {4, {{1032, 975, 878 }, {0} },
|
|
|
- {{2065, 1950, 1755}, {0} },
|
|
|
- {{4324, 4083, 3675}, {0} },
|
|
|
+ {4, {{1032, 976, 878 }, {0} },
|
|
|
+ {{2064, 1950, 1756}, {0} },
|
|
|
+ {{4324, 4083, 36756}, {0} },
|
|
|
{{8648, 8166, 7350}, {0} },
|
|
|
{{17294, 16334, 14700}, {0}}},
|
|
|
{5, {{1376, 1300, 1170}, {0} },
|
|
|
- {{2753, 2600, 2340}, {0} },
|
|
|
- {{5765, 5444, 4900}, {0} },
|
|
|
+ {{2752, 2600, 2340}, {0} },
|
|
|
+ {{5764, 5444, 4900}, {0} },
|
|
|
{{11530, 10888, 9800}, {0} },
|
|
|
{{23058, 21778, 19600}, {0} }} ,
|
|
|
- {6, {{1549, 1463, 1316}, {0} },
|
|
|
- {{3097, 2925, 2633}, {0} },
|
|
|
- {{6485, 6125, 5513}, {0} },
|
|
|
- {{12977, 12250, 11026}, {0} },
|
|
|
+ {6, {{1548, 1462, 1316}, {0} },
|
|
|
+ {{3098, 2926, 2632}, {0} },
|
|
|
+ {{6486, 6126, 5512}, {0} },
|
|
|
+ {{12970, 12250, 11026}, {0} },
|
|
|
{{25942, 24500, 22050}, {0} }} ,
|
|
|
- {7, {{1721, 1625, 1463}, {0} },
|
|
|
- {{3441, 3250, 2925}, {0} },
|
|
|
- {{7206, 6806, 6125}, {0} },
|
|
|
+ {7, {{1720, 1626, 1462}, {0} },
|
|
|
+ {{3442, 3250, 2926}, {0} },
|
|
|
+ {{7206, 6806, 61256}, {0} },
|
|
|
{{14412, 13612, 12250}, {0} },
|
|
|
{{28824, 27222, 24500}, {0} }} ,
|
|
|
- {8, {{2065, 1950, 1755}, {0} },
|
|
|
- {{4129, 3900, 3510}, {0} },
|
|
|
- {{8647, 8167, 7350}, {0} },
|
|
|
+ {8, {{2064, 1950, 1756}, {0} },
|
|
|
+ {{4130, 3900, 3510}, {0} },
|
|
|
+ {{8648, 8166, 7350}, {0} },
|
|
|
{{17294, 16334, 14700}, {0} },
|
|
|
{{34588, 32666, 29400}, {0} }} ,
|
|
|
- {9, {{2294, 2167, 1950}, {0} },
|
|
|
- {{4588, 4333, 3900}, {0} },
|
|
|
- {{9607, 9074, 8166}, {0} },
|
|
|
+ {9, {{2294, 2166, 1950}, {0} },
|
|
|
+ {{4588, 4334, 3900}, {0} },
|
|
|
+ {{9608, 9074, 8166}, {0} },
|
|
|
{{19216, 18148, 16334}, {0} },
|
|
|
{{38432, 36296, 32666}, {0} }} ,
|
|
|
- {10, {{2581, 2438, 2194}, {0} },
|
|
|
- {{5162, 4875, 4388}, {0} },
|
|
|
- {{10809, 10208, 9188}, {0} },
|
|
|
+ {10, {{2580, 2438, 2194}, {0} },
|
|
|
+ {{5162, 4876, 4388}, {0} },
|
|
|
+ {{10808, 10208, 9188}, {0} },
|
|
|
{{21618, 20416, 18376}, {0} },
|
|
|
{{43236, 40834, 36750}, {0} }} ,
|
|
|
{11, {{2868, 2708, 2438}, {0} },
|
|
|
- {{5735, 5417, 4875}, {0} },
|
|
|
- {{12010, 11343, 10208}, {0} },
|
|
|
+ {{5736, 5416, 4876}, {0} },
|
|
|
+ {{12010, 11342, 10208}, {0} },
|
|
|
{{24020, 22686, 20416}, {0} },
|
|
|
{{48040, 45370, 40834}, {0} }} ,
|
|
|
- {12, {{3097, 2925, 2633}, {0} },
|
|
|
- {{6194, 5850, 5265}, {0} },
|
|
|
- {{12971, 12250, 11025}, {0} },
|
|
|
+ {12, {{3098, 2926, 2632}, {0} },
|
|
|
+ {{6194, 5850, 5266}, {0} },
|
|
|
+ {{12970, 12250, 11026}, {0} },
|
|
|
{{25942, 24500, 22050}, {0} },
|
|
|
{{51882, 49000, 44100}, {0} }} ,
|
|
|
- {13, {{3441, 3250, 2925}, {0} },
|
|
|
+ {13, {{3442, 3250, 2926}, {0} },
|
|
|
{{6882, 6500, 5850}, {0} },
|
|
|
{{14412, 13611, 12250}, {0} },
|
|
|
{{28824, 27222, 24500}, {0} },
|
|
@@ -1131,7 +1131,7 @@ uint16_t wma_match_eht_rate(uint16_t raw_rate,
|
|
|
}
|
|
|
|
|
|
if (rate_flags & (TX_RATE_EHT80 | TX_RATE_EHT40 |
|
|
|
- TX_RATE_HE20 | TX_RATE_HE160)) {
|
|
|
+ TX_RATE_EHT20 | TX_RATE_EHT160)) {
|
|
|
nss1_rate = &eht_mcs_nss1[index].supported_eht20_rate[dcm_index][0];
|
|
|
nss2_rate = &eht_mcs_nss2[index].supported_eht20_rate[dcm_index][0];
|
|
|
match_rate = wma_mcs_rate_match(raw_rate, 1,
|