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

Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2016-07-06 21:23:26 -07:00
parent 1d1e0fd29b 03ac85b708
commit 2a5855706a
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ip/ipaddress.c
View File

@ -220,7 +220,7 @@ static char *parse_link_kind(struct rtattr *tb, bool slave)
return ""; 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]) if (!tb[IFLA_LINKINFO])
return -1; return -1;

4
man/man7/tc-hfsc.7
View File

@ -555,8 +555,8 @@ Please refer to \fBtc\-stab\fR(8)
. .
\fBtc\fR(8), \fBtc\-hfsc\fR(8), \fBtc\-stab\fR(8) \fBtc\fR(8), \fBtc\-hfsc\fR(8), \fBtc\-stab\fR(8)
Please direct bugreports and patches to: <net...@vger.kernel.org> Please direct bugreports and patches to: <netdev@vger.kernel.org>
. .
.SH "AUTHOR" .SH "AUTHOR"
. .
Manpage created by Michal Soltys (sol...@ziu.info) Manpage created by Michal Soltys (soltys@ziu.info)

1
man/man8/rtacct.8
View File

@ -35,6 +35,7 @@ Dump absolute values of counters. The default is to calculate increments since t
.TP .TP
.B \-s, \-\-noupdate .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. 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 .B \-j, \-\-json
Display results in JSON format. Display results in JSON format.
.TP .TP

4
man/man8/tc-hfsc.8
View File

@ -54,8 +54,8 @@ parameters, you will specify linear service curve.
. .
\fBtc\fR(8), \fBtc\-hfsc\fR(7), \fBtc\-stab\fR(8) \fBtc\fR(8), \fBtc\-hfsc\fR(7), \fBtc\-stab\fR(8)
Please direct bugreports and patches to: <net...@vger.kernel.org> Please direct bugreports and patches to: <netdev@vger.kernel.org>
. .
.SH "AUTHOR" .SH "AUTHOR"
. .
Manpage created by Michal Soltys (sol...@ziu.info) Manpage created by Michal Soltys (soltys@ziu.info)

4
man/man8/tc-stab.8
View File

@ -156,8 +156,8 @@ it's good to use \fBethtool\fR to turn off offloading features.
.br .br
\fB[2]\fR http://www.faqs.org/rfcs/rfc2684.html \fB[2]\fR http://www.faqs.org/rfcs/rfc2684.html
Please direct bugreports and patches to: <net...@vger.kernel.org> Please direct bugreports and patches to: <netdev@vger.kernel.org>
. .
.SH "AUTHOR" .SH "AUTHOR"
. .
Manpage created by Michal Soltys (sol...@ziu.info) Manpage created by Michal Soltys (soltys@ziu.info)