diff options
| author | David Ahern <dsahern@gmail.com> | 2019-07-09 14:26:44 -0700 |
|---|---|---|
| committer | David Ahern <dsahern@gmail.com> | 2019-07-09 14:26:44 -0700 |
| commit | 830ac9abe62d00304ce4dbd2194ec6ad2d217de1 (patch) | |
| tree | 459cde21b220c2b1476028e75f1789cb09342157 /misc/ss.c | |
| parent | 0f48f9f46ae83c042d36c1208b0f79966f92a951 (diff) | |
| parent | af2583437ea03f7d74815bee7c1c7b03baaf4894 (diff) | |
| download | iproute2-830ac9abe62d00304ce4dbd2194ec6ad2d217de1.tar.gz | |
Merge branch 'master' into next
Signed-off-by: David Ahern <dsahern@gmail.com>
Diffstat (limited to 'misc/ss.c')
| -rw-r--r-- | misc/ss.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -2361,7 +2361,9 @@ static int proc_inet_split_line(char *line, char **loc, char **rem, char **data) static char *sprint_bw(char *buf, double bw) { - if (bw > 1000000.) + if (!resolve_services) + sprintf(buf, "%.0f", bw); + else if (bw > 1000000.) sprintf(buf, "%.1fM", bw / 1000000.); else if (bw > 1000.) sprintf(buf, "%.1fK", bw / 1000.); |