From 6cef544b96696c2458749d7edb7ee72502d7d689 Mon Sep 17 00:00:00 2001 From: Li Wei Date: Wed, 11 Jul 2012 15:56:57 +0000 Subject: [PATCH] tc: man: change man page and comment to confirm to code's behavior. Since the get_rate() code incorrectly interpreted bare number, the behavior is not the same as man page and comment described. We need to change the man page and comment for compatible with the existing usage by scripts. --- man/man8/tc.8 | 7 +++++-- tc/tc_util.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/man/man8/tc.8 b/man/man8/tc.8 index 346c54552..95571a3ee 100644 --- a/man/man8/tc.8 +++ b/man/man8/tc.8 @@ -259,6 +259,9 @@ All parameters accept a floating point number, possibly followed by a unit. .P Bandwidths or rates can be specified in: .TP +bps +Bytes per second +.TP kbps Kilobytes per second .TP @@ -271,8 +274,8 @@ Kilobits per second mbit Megabits per second .TP -bps or a bare number -Bytes per second +bit or a bare number +Bits per second .P Amounts of data can be specified in: .TP diff --git a/tc/tc_util.c b/tc/tc_util.c index 926ed08bd..ccf8fa4dc 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -153,7 +153,7 @@ int get_rate(unsigned *rate, const char *str) return -1; if (*p == '\0') { - *rate = bps / 8.; /* assume bytes/sec */ + *rate = bps / 8.; /* assume bits/sec */ return 0; } -- 2.47.3