iw: add TID specific Tx bitrate configuration

Add TID specific Tx bitrate configuration by using
handle_bitrates already APIs.

Examples:
	$ iw dev wlan0 set tidconf peer xx:xx:xx:xx:xx:xx tids 0x2 bitrates auto
	$ iw dev wlan0 set tidconf peer xx:xx:xx:xx:xx:xx tids 0x2 bitrates limit vht-mcs-5 4:9

Signed-off-by: Tamizh Chelvam <tamizhr@codeaurora.org>
Link: https://lore.kernel.org/r/01010174674cba3e-ae0b7501-76dd-4bbd-870f-a799e0558e1e-000000@us-west-2.amazonses.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/bitrate.c b/bitrate.c
index 780017f188358fab8b5b23aef046cc5a7ba02334..32a23a9389147b921627b16528f2c84101e2070d 100644 (file)
--- a/bitrate.c
+++ b/bitrate.c
@@ -76,13 +76,12 @@ static int setup_vht(struct nl80211_txrate_vht *txrate_vht,
 
 #define VHT_ARGC_MAX   100
 
-static int handle_bitrates(struct nl80211_state *state,
-                          struct nl_msg *msg,
-                          int argc, char **argv,
-                          enum id_input id)
+int set_bitrates(struct nl_msg *msg,
+                int argc, char **argv,
+                enum nl80211_attrs attr)
 {
        struct nlattr *nl_rates, *nl_band;
-       int i;
+       int i, ret = 0;
        bool have_legacy_24 = false, have_legacy_5 = false;
        uint8_t legacy_24[32], legacy_5[32];
        int n_legacy_24 = 0, n_legacy_5 = 0;
@@ -195,10 +194,16 @@ static int handle_bitrates(struct nl80211_state *state,
                case S_GI:
                        break;
                default:
+                       if (attr != NL80211_ATTR_TX_RATES)
+                               goto next;
                        return 1;
                }
        }
 
+next:
+       if (attr != NL80211_ATTR_TX_RATES)
+               ret = i;
+
        if (have_vht_mcs_24)
                if (!setup_vht(&txrate_vht_24, vht_argc_24, vht_argv_24))
                        return -EINVAL;
@@ -213,7 +218,7 @@ static int handle_bitrates(struct nl80211_state *state,
        if (sgi_24 && lgi_24)
                return 1;
 
-       nl_rates = nla_nest_start(msg, NL80211_ATTR_TX_RATES);
+       nl_rates = nla_nest_start(msg, attr);
        if (!nl_rates)
                goto nla_put_failure;
 
@@ -253,11 +258,19 @@ static int handle_bitrates(struct nl80211_state *state,
 
        nla_nest_end(msg, nl_rates);
 
-       return 0;
+       return ret;
  nla_put_failure:
        return -ENOBUFS;
 }
 
+static int handle_bitrates(struct nl80211_state *state,
+                          struct nl_msg *msg,
+                          int argc, char **argv,
+                          enum id_input id)
+{
+       return set_bitrates(msg, argc, argv, NL80211_ATTR_TX_RATES);
+}
+
 #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> <NSS:MCSx,MCSy... | NSS:MCSx-MCSy>*] [sgi-2.4|lgi-2.4] [sgi-5|lgi-5]"
 

diff --git a/interface.c b/interface.c
index c9da4b4997a85860bfcdb4ed6b64b64173ab5c9f..89c95a9ac4ab3dd72bfa2d86035f9cbe484f4649 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -757,6 +757,7 @@ static int handle_tid_config(struct nl80211_state *state,
 {
        struct nlattr *tids_array = NULL;
        struct nlattr *tids_entry = NULL;
+       enum nl80211_tx_rate_setting txrate_type;
        unsigned char peer[ETH_ALEN];
        int tids_num = 0;
        char *end;
@@ -766,6 +767,7 @@ static int handle_tid_config(struct nl80211_state *state,
                PS_TIDS,
                PS_CONF,
        } parse_state = PS_ADDR;
+       unsigned int attr;
 
        while (argc) {
                switch (parse_state) {
@@ -920,6 +922,34 @@ static int handle_tid_config(struct nl80211_state *state,
 
                                argc -= 2;
                                argv += 2;
+                       } else if (strcmp(argv[0], "bitrates") == 0) {
+                               if (argc < 2) {
+                                       fprintf(stderr, "not enough args for %s\n", argv[0]);
+                                       return HANDLER_RET_USAGE;
+                               }
+                               if (!strcmp(argv[1], "auto"))
+                                       txrate_type = NL80211_TX_RATE_AUTOMATIC;
+                               else if (!strcmp(argv[1], "fixed"))
+                                       txrate_type = NL80211_TX_RATE_FIXED;
+                               else if (!strcmp(argv[1], "limit"))
+                                       txrate_type = NL80211_TX_RATE_LIMITED;
+                               else {
+                                       printf("Invalid parameter: %s\n", argv[0]);
+                                       return 2;
+                               }
+                               NLA_PUT_U8(msg, NL80211_TID_CONFIG_ATTR_TX_RATE_TYPE, txrate_type);
+                               argc -= 2;
+                               argv += 2;
+                               if (txrate_type != NL80211_TX_RATE_AUTOMATIC) {
+                                       attr = NL80211_TID_CONFIG_ATTR_TX_RATE;
+                                       ret = set_bitrates(msg, argc, argv,
+                                                          attr);
+                                       if (ret < 2)
+                                               return 1;
+
+                                       argc -= ret;
+                                       argv += ret;
+                               }
                        } else {
                                fprintf(stderr, "Unknown parameter: %s\n", argv[0]);
                                return HANDLER_RET_USAGE;
@@ -945,7 +975,9 @@ nla_put_failure:
 }
 
 COMMAND(set, tidconf, "[peer <MAC address>] tids <mask> [override] [sretry <num>] [lretry <num>] "
-       "[ampdu [on|off]] [amsdu [on|off]] [noack [on|off]] [rtscts [on|off]]",
+       "[ampdu [on|off]] [amsdu [on|off]] [noack [on|off]] [rtscts [on|off]]"
+       "[bitrates <type [auto|fixed|limit]> [legacy-<2.4|5> <legacy rate in Mbps>*] [ht-mcs-<2.4|5> <MCS index>*]"
+       " [vht-mcs-<2.4|5> <NSS:MCSx,MCSy... | NSS:MCSx-MCSy>*] [sgi-2.4|lgi-2.4] [sgi-5|lgi-5]]",
        NL80211_CMD_SET_TID_CONFIG, 0, CIB_NETDEV, handle_tid_config,
        "Setup per-node TID specific configuration for TIDs selected by bitmask.\n"
        "If MAC address is not specified, then supplied TID configuration\n"
@@ -955,4 +987,6 @@ COMMAND(set, tidconf, "[peer <MAC address>] tids <mask> [override] [sretry <num>
        "  $ iw dev wlan0 set tidconf tids 0x5 ampdu off amsdu off rtscts on\n"
        "  $ iw dev wlan0 set tidconf tids 0x3 override ampdu on noack on rtscts on\n"
        "  $ iw dev wlan0 set tidconf peer xx:xx:xx:xx:xx:xx tids 0x1 ampdu off tids 0x3 amsdu off rtscts on\n"
+       "  $ iw dev wlan0 set tidconf peer xx:xx:xx:xx:xx:xx tids 0x2 bitrates auto\n"
+       "  $ iw dev wlan0 set tidconf peer xx:xx:xx:xx:xx:xx tids 0x2 bitrates limit vht-mcs-5 4:9\n"
        );

diff --git a/iw.h b/iw.h
index 51f5ca8987199155dc322da87825ad3365768002..1acf1891767df436149d778b3d47c608ec98d4a7 100644 (file)
--- a/iw.h
+++ b/iw.h
@@ -261,4 +261,7 @@ void nan_bf(uint8_t idx, uint8_t *bf, uint16_t bf_len, const uint8_t *buf,
 
 char *hex2bin(const char *hex, char *buf);
 
+int set_bitrates(struct nl_msg *msg, int argc, char **argv,
+                enum nl80211_attrs attr);
+
 #endif /* __IW_H */