Adding mcs fixed rate settings for HE UL MU traffic, which encompasses
both UL-OFDMA and UL-MUMIO.
Signed-off-by: Muna Sinada <[email protected]>
---
bitrate.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 46 insertions(+), 6 deletions(-)
diff --git a/bitrate.c b/bitrate.c
index 70a23fb6ac83..556d3ab5f320 100644
--- a/bitrate.c
+++ b/bitrate.c
@@ -156,20 +156,26 @@ static int handle_bitrates(struct nl80211_state *state,
bool have_ht_mcs_24 = false, have_ht_mcs_5 = false;
bool have_vht_mcs_24 = false, have_vht_mcs_5 = false;
bool have_he_mcs_24 = false, have_he_mcs_5 = false;
+ bool have_he_ul_mcs_24 = false, have_he_ul_mcs_5 = false;
uint8_t ht_mcs_24[77], ht_mcs_5[77];
int n_ht_mcs_24 = 0, n_ht_mcs_5 = 0;
struct nl80211_txrate_vht txrate_vht_24 = {};
struct nl80211_txrate_vht txrate_vht_5 = {};
struct nl80211_txrate_he txrate_he_24 = {};
struct nl80211_txrate_he txrate_he_5 = {};
+ struct nl80211_txrate_he txrate_he_ul_24 = {};
+ struct nl80211_txrate_he txrate_he_ul_5 = {};
uint8_t *mcs = NULL;
int *n_mcs = NULL;
char *vht_argv_5[VHT_ARGC_MAX] = {}; char *vht_argv_24[VHT_ARGC_MAX] = {};
char *he_argv_5[VHT_ARGC_MAX] = {}; char *he_argv_24[VHT_ARGC_MAX] = {};
- char **vht_argv = NULL, **he_argv = NULL;
+ char *he_ul_argv_5[VHT_ARGC_MAX] = {};
+ char *he_ul_argv_24[VHT_ARGC_MAX] = {};
+ char **vht_argv = NULL, **he_argv = NULL, **he_ul_argv = NULL;
int vht_argc_5 = 0; int vht_argc_24 = 0;
int he_argc_5 = 0; int he_argc_24 = 0;
- int *vht_argc = NULL, *he_argc = NULL;
+ int he_ul_argc_5 = 0; int he_ul_argc_24 = 0;
+ int *vht_argc = NULL, *he_argc = NULL, *he_ul_argc = NULL;
int sgi_24 = 0, sgi_5 = 0, lgi_24 = 0, lgi_5 = 0;
int has_he_gi_24 = 0, has_he_gi_5 = 0, has_he_ltf_24 = 0, has_he_ltf_5 = 0;
int he_gi = 0, he_ltf = 0;
@@ -184,6 +190,7 @@ static int handle_bitrates(struct nl80211_state *state,
S_GI,
S_HE_GI,
S_HE_LTF,
+ S_HE_UL,
} parser_state = S_NONE;
for (i = 0; i < argc; i++) {
@@ -272,6 +279,20 @@ static int handle_bitrates(struct nl80211_state *state,
} else if (strcmp(argv[i], "he-ltf-5") == 0) {
has_he_ltf_5 = 1;
parser_state = S_HE_LTF;
+ } else if (strcmp(argv[i], "he-ul-mcs-2.4") == 0) {
+ if (have_he_ul_mcs_24)
+ return 1;
+ parser_state = S_HE_UL;
+ he_ul_argv = he_ul_argv_24;
+ he_ul_argc = &he_ul_argc_24;
+ have_he_ul_mcs_24 = true;
+ } else if (strcmp(argv[i], "he-ul-mcs-5") == 0) {
+ if (have_he_ul_mcs_5)
+ return 1;
+ parser_state = S_HE_UL;
+ he_ul_argv = he_ul_argv_5;
+ he_ul_argc = &he_ul_argc_5;
+ have_he_ul_mcs_5 = true;
} else switch (parser_state) {
case S_LEGACY:
tmpd = strtod(argv[i], &end);
@@ -312,6 +333,11 @@ static int handle_bitrates(struct nl80211_state *state,
return 1;
he_ltf = he_ltf >> 1;
break;
+ case S_HE_UL:
+ if (*he_ul_argc >= VHT_ARGC_MAX)
+ return 1;
+ he_ul_argv[(*he_ul_argc)++] = argv[i];
+ break;
default:
return 1;
}
@@ -345,12 +371,20 @@ static int handle_bitrates(struct nl80211_state *state,
return 1;
}
+ if (have_he_ul_mcs_24)
+ if (!setup_he(&txrate_he_ul_24, he_ul_argc_24, he_ul_argv_24))
+ return -EINVAL;
+
+ if (have_he_ul_mcs_5)
+ if (!setup_he(&txrate_he_ul_5, he_ul_argc_5, he_ul_argv_5))
+ return -EINVAL;
+
nl_rates = nla_nest_start(msg, NL80211_ATTR_TX_RATES);
if (!nl_rates)
goto nla_put_failure;
if (have_legacy_24 || have_ht_mcs_24 || have_vht_mcs_24 || have_he_mcs_24 ||
- sgi_24 || lgi_24 || has_he_gi_24 || has_he_ltf_24) {
+ sgi_24 || lgi_24 || has_he_gi_24 || has_he_ltf_24 || have_he_ul_mcs_24) {
nl_band = nla_nest_start(msg, NL80211_BAND_2GHZ);
if (!nl_band)
goto nla_put_failure;
@@ -371,11 +405,14 @@ static int handle_bitrates(struct nl80211_state *state,
nla_put_u8(msg, NL80211_TXRATE_HE_GI, he_gi);
if (has_he_ltf_24)
nla_put_u8(msg, NL80211_TXRATE_HE_LTF, he_ltf);
+ if (have_he_ul_mcs_24)
+ nla_put(msg, NL80211_TXRATE_HE_UL, sizeof(txrate_he_ul_24),
+ &txrate_he_ul_24);
nla_nest_end(msg, nl_band);
}
if (have_legacy_5 || have_ht_mcs_5 || have_vht_mcs_5 || have_he_mcs_5 ||
- sgi_5 || lgi_5 || has_he_gi_5 || has_he_ltf_5) {
+ sgi_5 || lgi_5 || has_he_gi_5 || has_he_ltf_5 || have_he_ul_mcs_5) {
nl_band = nla_nest_start(msg, NL80211_BAND_5GHZ);
if (!nl_band)
goto nla_put_failure;
@@ -396,6 +433,9 @@ static int handle_bitrates(struct nl80211_state *state,
nla_put_u8(msg, NL80211_TXRATE_HE_GI, he_gi);
if (has_he_ltf_5)
nla_put_u8(msg, NL80211_TXRATE_HE_LTF, he_ltf);
+ if (have_he_ul_mcs_5)
+ nla_put(msg, NL80211_TXRATE_HE_UL, sizeof(txrate_he_ul_5),
+ &txrate_he_ul_5);
nla_nest_end(msg, nl_band);
}
@@ -407,9 +447,9 @@ static int handle_bitrates(struct nl80211_state *state,
}
#define DESCR_LEGACY "[legacy-<2.4|5> <legacy rate in Mbps>*]"
-#define DESCR DESCR_LEGACY " [ht-mcs-<2.4|5> <MCS index>*] [vht-mcs-<2.4|5> [he-mcs-<2.4|5> <NSS:MCSx,MCSy... | NSS:MCSx-MCSy>*] [sgi-2.4|lgi-2.4] [sgi-5|lgi-5]"
+#define DESCR DESCR_LEGACY " [ht-mcs-<2.4|5> <MCS index>*] [vht-mcs-<2.4|5> [he-mcs-<2.4|5> <NSS:MCSx,MCSy... | NSS:MCSx-MCSy>*] [sgi-2.4|lgi-2.4] [sgi-5|lgi-5] [he-ul-mcs-<2.4|5> <NSS:MCS>]"
-COMMAND(set, bitrates, "[legacy-<2.4|5> <legacy rate in Mbps>*] [ht-mcs-<2.4|5> <MCS index>*] [vht-mcs-<2.4|5> [he-mcs-<2.4|5> <NSS:MCSx,MCSy... | NSS:MCSx-MCSy>*] [sgi-2.4|lgi-2.4] [sgi-5|lgi-5] [he-gi-2.4:0.8/1.6/3.2] [he-gi-5:0.8/1.6/3.2] [he-ltf-2.4:1/2/4] [he-ltf-5:1/2/4]",
+COMMAND(set, bitrates, "[legacy-<2.4|5> <legacy rate in Mbps>*] [ht-mcs-<2.4|5> <MCS index>*] [vht-mcs-<2.4|5> [he-mcs-<2.4|5> <NSS:MCSx,MCSy... | NSS:MCSx-MCSy>*] [sgi-2.4|lgi-2.4] [sgi-5|lgi-5] [he-gi-2.4:0.8/1.6/3.2] [he-gi-5:0.8/1.6/3.2] [he-ltf-2.4:1/2/4] [he-ltf-5:1/2/4] [he-ul-mcs-<2.4|5> <NSS:MCS>]",
NL80211_CMD_SET_TX_BITRATE_MASK, 0, CIB_NETDEV, handle_bitrates,
"Sets up the specified rate masks.\n"
"Not passing any arguments would clear the existing mask (if any).");
--
2.7.4
On Tue, 2021-03-09 at 10:16 -0800, Muna Sinada wrote:
> Adding mcs fixed rate settings for HE UL MU traffic, which encompasses
> both UL-OFDMA and UL-MUMIO.
This patch doesn't apply.
johannes