matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'iproute2-master' into iproute2-next 

Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
David Ahern 2018-01-29 08:24:57 -08:00
parent c061b75895 50b8a842e8
commit 1e24e773f1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/SNAPSHOT.h
View File

@ -1 +1 @@
static const char SNAPSHOT[] = "171113";
static const char SNAPSHOT[] = "180129";

2
ip/ipaddress.c
View File

@ -598,7 +598,7 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s,
const struct rtattr *carrier_changes)
{
if (is_json_context()) {
open_json_object("stats644");
open_json_object("stats64");
/* RX stats */
open_json_object("rx");

2
tc/tc_util.c
View File

@ -846,7 +846,7 @@ void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtat
print_string(PRINT_FP, NULL, "backlog %s",
sprint_size(q.backlog, b1));
print_uint(PRINT_ANY, "qlen", " %up", q.qlen);
print_uint(PRINT_ANY, "requeues", " requeues %u", q.qlen);
print_uint(PRINT_FP, NULL, " requeues %u", q.requeues);
}
if (xstats)