OSDN Git Service

Merge branch 'bpf-proto-fixes'
authorDaniel Borkmann <daniel@iogearbox.net>
Tue, 23 Apr 2019 23:32:27 +0000 (01:32 +0200)
committerDaniel Borkmann <daniel@iogearbox.net>
Tue, 23 Apr 2019 23:32:28 +0000 (01:32 +0200)
Willem de Bruijn says:

====================
Expand the tc tunnel encap support with protocols that convert the
network layer protocol, such as 6in4. This is analogous to existing
support in bpf_skb_proto_6_to_4.

Patch 1 implements the straightforward logic
Patch 2 tests it with a 6in4 tunnel

Changes v1->v2
  - improve documentation in test
====================

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

Trivial merge