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 2017-06-27 16:10:55 -07:00
parent 59eb271d1d c9c3720d14
commit 1fd8a8e23d
7 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/bpf.c
View File

@ -1795,8 +1795,10 @@ static int bpf_fetch_prog_relo(struct bpf_elf_ctx *ctx, const char *section,
*sseen = true;
ret = bpf_apply_relo_data(ctx, &data_relo, &data_insn);
if (ret < 0)
if (ret < 0) {
*lderr = true;
return ret;
}
memset(&prog, 0, sizeof(prog));
prog.type = ctx->type;

2
man/man3/Makefile
View File

@ -1,4 +1,4 @@
MAN3PAGES=libnetlink.3
MAN3PAGES = $(wildcard *.3)
all:

2
man/man7/Makefile
View File

@ -1,4 +1,4 @@
MAN7PAGES = tc-hfsc.7
MAN7PAGES = $(wildcard *.7)
all:

21
man/man8/Makefile
View File

@ -1,25 +1,6 @@
TARGETS = ip-address.8 ip-link.8 ip-route.8
MAN8PAGES = $(TARGETS) ip.8 arpd.8 lnstat.8 routel.8 rtacct.8 rtmon.8 rtpr.8 ss.8 \
tc.8 tc-bfifo.8 tc-bpf.8 tc-cbq.8 tc-cbq-details.8 tc-choke.8 tc-codel.8 \
tc-fq.8 \
tc-drr.8 tc-ematch.8 tc-fq_codel.8 tc-hfsc.8 tc-htb.8 tc-pie.8 \
tc-mqprio.8 tc-netem.8 tc-pfifo.8 tc-pfifo_fast.8 tc-prio.8 tc-red.8 \
tc-sfb.8 tc-sfq.8 tc-stab.8 tc-tbf.8 \
bridge.8 rtstat.8 ctstat.8 nstat.8 routef.8 \
ip-addrlabel.8 ip-fou.8 ip-gue.8 ip-l2tp.8 ip-macsec.8 \
ip-maddress.8 ip-monitor.8 ip-mroute.8 ip-neighbour.8 \
ip-netns.8 ip-ntable.8 ip-rule.8 ip-tunnel.8 ip-xfrm.8 \
ip-tcp_metrics.8 ip-netconf.8 ip-token.8 \
tipc.8 tipc-bearer.8 tipc-link.8 tipc-media.8 tipc-nametable.8 \
tipc-node.8 tipc-socket.8 \
tc-basic.8 tc-cgroup.8 tc-flow.8 tc-flower.8 tc-fw.8 tc-route.8 \
tc-tcindex.8 tc-u32.8 tc-matchall.8 \
tc-connmark.8 tc-csum.8 tc-mirred.8 tc-nat.8 tc-pedit.8 tc-police.8 \
tc-simple.8 tc-skbedit.8 tc-vlan.8 tc-xt.8 tc-skbmod.8 tc-ife.8 \
tc-tunnel_key.8 tc-sample.8 \
devlink.8 devlink-dev.8 devlink-monitor.8 devlink-port.8 devlink-sb.8 \
ifstat.8
MAN8PAGES = $(TARGETS) $(filter-out $(TARGETS),$(wildcard *.8))
all: $(TARGETS)

2
man/man8/ip-route.8.in
View File

@ -387,7 +387,7 @@ from
.BI preference " NUMBER"
the preference value of the route.
.I NUMBER
is an arbitrary 32bit number.
is an arbitrary 32bit number, where routes with lower values are preferred.
.TP
.BI table " TABLEID"

11
man/man8/tc-u32.8
View File

@ -29,6 +29,10 @@ u32 \- universal 32bit traffic control filter
.IR HANDLE " ] [ "
.B indev
.IR ifname " ] [ "
.B skip_hw
.R "|"
.B skip_sw
.R " ] [ "
.BR help " ]"
.ti -8
@ -331,6 +335,13 @@ option.
Filter on the incoming interface of the packet. Obviously works only for
forwarded traffic.
.TP
.BI skip_sw
Do not process filter by software. If hardware has no offload support for this
filter, or TC offload is not enabled for the interface, operation will fail.
.TP
.BI skip_hw
Do not process filter by hardware.
.TP
.BI help
Print a brief help text about possible options.
.SH SELECTORS

2
tc/f_u32.c
View File

@ -34,7 +34,7 @@ static void explain(void)
"Usage: ... u32 [ match SELECTOR ... ] [ link HTID ] [ classid CLASSID ]\n"
" [ action ACTION_SPEC ] [ offset OFFSET_SPEC ]\n"
" [ ht HTID ] [ hashkey HASHKEY_SPEC ]\n"
" [ sample SAMPLE ] [skip-hw | skip-sw]\n"
" [ sample SAMPLE ] [skip_hw | skip_sw]\n"
"or u32 divisor DIVISOR\n"
"\n"
"Where: SELECTOR := SAMPLE SAMPLE ...\n"