Merge branch 'ipv6-gre-collect_md'

Browse source

William Tu says:

====================
add ip6 gre and gretap collect_md mode

Similar to gre, vxlan, geneve, ipip tunnels, allow ip6gretap tunnels to
operate in collect metadata mode.  The first patch adds the support to
ip6_gre.c. The second patch enables unsetting the csum for ipv6 tunnel,
when using bpf_skb_[gs]et_tunnel_key() helpers.  Finally, the last patch
adds the ip6 gre and gretap tunnel test cases to BPF sample code.

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

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

...

This commit is contained in:

David S. Miller 2017-12-04 11:04:20 -05:00

parent c34bc2b505 56ddd30280

commit 90ffa72ff4

5 changed files with 210 additions and 13 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

5

net/core/filter.c

View file

105

net/ipv6/ip6_gre.c

View file

5

net/ipv6/ip6_tunnel.c

View file

43

samples/bpf/tcbpf2_kern.c

View file

65

samples/bpf/test_tunnel_bpf.sh

View file