Merge branch 'ebpf-next'

Browse source

Daniel Borkmann says:

====================
This set adds native eBPF support also to act_bpf and thus covers tc
with eBPF in the classifier *and* action part.

A link to iproute2 preview has been provided in patch 2 and the code
will be pushed out after Stephen has processed the classifier part
and helper bits for tc.

This set depends on ced585c83b ("act_bpf: allow non-default TC_ACT
opcodes as BPF exec outcome"), so a net into net-next merge would be
required first. Hope that's fine by you, Dave. ;)
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2015-03-20 19:10:50 -04:00

parent 0fa74a4be4 a8cb5f556b

commit f6877fcf22

6 changed files with 228 additions and 83 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

include/net/tc_act/tc_bpf.h

View file

1

include/uapi/linux/bpf.h

View file

2

include/uapi/linux/tc_act/tc_bpf.h

View file

1

kernel/bpf/verifier.c

View file

6

net/core/filter.c

View file

295

net/sched/act_bpf.c

View file