Merge branch 'ipv6-add-ip6erspan-collect_md-mode'

Browse source

William Tu says:

====================
ipv6: add ip6erspan collect_md mode

Similar to erspan collect_md mode in ipv4, the first patch adds
support for ip6erspan collect metadata mode.  The second patch
adds the test case using bpf_skb_[gs]et_tunnel_key helpers.

The corresponding iproute2 patch:
https://marc.info/?l=linux-netdev&m=151251545410047&w=2
====================

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

...

This commit is contained in:

David S. Miller 2017-12-06 14:45:29 -05:00

parent 92425c4067 d37e3bb774

commit 3a9ab39328

3 changed files with 180 additions and 25 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

110

net/ipv6/ip6_gre.c

View file

58

samples/bpf/tcbpf2_kern.c

View file

37

samples/bpf/test_tunnel_bpf.sh

View file