diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-03-08 13:58:52 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-08 13:58:52 -0500 |
| commit | d24ad3fc0e454b4354acc10149ecceda445d6a75 (patch) | |
| tree | 5ae7116e18f4bd6646ba8f5809a1d1eb6efbda33 /net/sched/sch_dsmark.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | vxlan: allow setting ipv6 traffic class (diff) | |
| download | linux-dev-d24ad3fc0e454b4354acc10149ecceda445d6a75.tar.xz linux-dev-d24ad3fc0e454b4354acc10149ecceda445d6a75.zip | |
Merge branch 'bpf-next'
Daniel Borkmann says:
====================
BPF updates
Couple of misc updates to BPF, besides others this series adds
bpf_csum_diff() to be used with L3 csums, allows for managing
tunnel options for collect meta data mode, and enabling ipv6
traffic class for collect meta data in vxlan specifically (geneve
already supports it). For more details, please see individual
patches.
The series requires net to be merged into net-next first to
avoid any further pending merge conflicts.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_dsmark.c')
0 files changed, 0 insertions, 0 deletions