diff options
| author | Jiri Pirko <jiri@nvidia.com> | 2022-09-29 12:24:35 +0200 |
|---|---|---|
| committer | David Ahern <dsahern@kernel.org> | 2022-09-29 08:50:30 -0600 |
| commit | 16d2732a5283b94c10081792b67f5d29ed6b16c7 (patch) | |
| tree | b0095bce9aa95cfcf68b6caefc8ae5bc7452b714 /devlink | |
| parent | 0cc5533b71dc3d3f07e04e78b36c24e01610837f (diff) | |
| download | iproute2-16d2732a5283b94c10081792b67f5d29ed6b16c7.tar.gz | |
devlink: move use_iec into struct dl
Similar to other bool opts that could be set by the user, move the
global variable use_iec to be part of struct dl.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
Diffstat (limited to 'devlink')
| -rw-r--r-- | devlink/devlink.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/devlink/devlink.c b/devlink/devlink.c index 4f77e42f..0e194c98 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -71,8 +71,6 @@ static bool g_indent_newline; #define INDENT_STR_MAXLEN 32 static char g_indent_str[INDENT_STR_MAXLEN + 1] = ""; -static bool use_iec = false; - static void __attribute__((format(printf, 1, 2))) pr_err(const char *fmt, ...) { @@ -374,6 +372,7 @@ struct dl { bool verbose; bool stats; bool hex; + bool use_iec; bool map_loaded; struct { bool present; @@ -4926,7 +4925,7 @@ static void pr_out_port_fn_rate(struct dl *dl, struct nlattr **tb) mnl_attr_get_u64(tb[DEVLINK_ATTR_RATE_TX_SHARE]); if (rate) - print_rate(use_iec, PRINT_ANY, "tx_share", + print_rate(dl->use_iec, PRINT_ANY, "tx_share", " tx_share %s", rate); } if (tb[DEVLINK_ATTR_RATE_TX_MAX]) { @@ -4934,7 +4933,7 @@ static void pr_out_port_fn_rate(struct dl *dl, struct nlattr **tb) mnl_attr_get_u64(tb[DEVLINK_ATTR_RATE_TX_MAX]); if (rate) - print_rate(use_iec, PRINT_ANY, "tx_max", + print_rate(dl->use_iec, PRINT_ANY, "tx_max", " tx_max %s", rate); } if (tb[DEVLINK_ATTR_RATE_PARENT_NODE_NAME]) { @@ -9739,7 +9738,7 @@ int main(int argc, char **argv) } break; case 'i': - use_iec = true; + dl->use_iec = true; break; case 'x': dl->hex = true; |