From fab3e001fde511db507ba8c6fc4d1620ac9ced65 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Tue, 5 Jul 2016 18:08:50 +0900 Subject: [PATCH 1/3] man: rtacct: add missing TP marker Signed-off-by: Masatake YAMATO --- man/man8/rtacct.8 | 1 + 1 file changed, 1 insertion(+) diff --git a/man/man8/rtacct.8 b/man/man8/rtacct.8 index 7cf97aa4..01321e6d 100644 --- a/man/man8/rtacct.8 +++ b/man/man8/rtacct.8 @@ -35,6 +35,7 @@ Dump absolute values of counters. The default is to calculate increments since t .TP .B \-s, \-\-noupdate Do not update history, so that the next time you will see counters including values accumulated to the moment of this measurement too. +.TP .B \-j, \-\-json Display results in JSON format. .TP From 509dcd43c91abf834721ca6f92b6617fde36ed41 Mon Sep 17 00:00:00 2001 From: Michal Soltys Date: Sat, 2 Jul 2016 13:03:12 +0200 Subject: [PATCH 2/3] iproute2: unmangle netdev/my emails in man pages (hfsc, stab) No other man pages do so, hiding netdev is kind of silly and I don't mind having my own address normally visible. --- man/man7/tc-hfsc.7 | 4 ++-- man/man8/tc-hfsc.8 | 4 ++-- man/man8/tc-stab.8 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/man/man7/tc-hfsc.7 b/man/man7/tc-hfsc.7 index ca049619..5ae5e6b3 100644 --- a/man/man7/tc-hfsc.7 +++ b/man/man7/tc-hfsc.7 @@ -555,8 +555,8 @@ Please refer to \fBtc\-stab\fR(8) . \fBtc\fR(8), \fBtc\-hfsc\fR(8), \fBtc\-stab\fR(8) -Please direct bugreports and patches to: +Please direct bugreports and patches to: . .SH "AUTHOR" . -Manpage created by Michal Soltys (sol...@ziu.info) +Manpage created by Michal Soltys (soltys@ziu.info) diff --git a/man/man8/tc-hfsc.8 b/man/man8/tc-hfsc.8 index 5444118e..fd0df8ff 100644 --- a/man/man8/tc-hfsc.8 +++ b/man/man8/tc-hfsc.8 @@ -54,8 +54,8 @@ parameters, you will specify linear service curve. . \fBtc\fR(8), \fBtc\-hfsc\fR(7), \fBtc\-stab\fR(8) -Please direct bugreports and patches to: +Please direct bugreports and patches to: . .SH "AUTHOR" . -Manpage created by Michal Soltys (sol...@ziu.info) +Manpage created by Michal Soltys (soltys@ziu.info) diff --git a/man/man8/tc-stab.8 b/man/man8/tc-stab.8 index 02caa7df..03a0659b 100644 --- a/man/man8/tc-stab.8 +++ b/man/man8/tc-stab.8 @@ -156,8 +156,8 @@ it's good to use \fBethtool\fR to turn off offloading features. .br \fB[2]\fR http://www.faqs.org/rfcs/rfc2684.html -Please direct bugreports and patches to: +Please direct bugreports and patches to: . .SH "AUTHOR" . -Manpage created by Michal Soltys (sol...@ziu.info) +Manpage created by Michal Soltys (soltys@ziu.info) From 03ac85b708168c57ce6ec32dfa5aa850fbf2c4ee Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 30 Jun 2016 16:47:02 +0200 Subject: [PATCH 3/3] ip-address: constify match_link_kind arg Since the function won't ever change the data 'kind' is pointing at, it can sanely be made const. Fixes: e0513807f6dbb ("ip-address: Support filtering by slave type, too") Suggested-by: Stephen Hemminger Signed-off-by: Phil Sutter --- ip/ipaddress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ip/ipaddress.c b/ip/ipaddress.c index d4d64950..02bc9029 100644 --- a/ip/ipaddress.c +++ b/ip/ipaddress.c @@ -220,7 +220,7 @@ static char *parse_link_kind(struct rtattr *tb, bool slave) return ""; } -static int match_link_kind(struct rtattr **tb, char *kind, bool slave) +static int match_link_kind(struct rtattr **tb, const char *kind, bool slave) { if (!tb[IFLA_LINKINFO]) return -1;