From: Daniel Borkmann <daniel@iogearbox.net>
Date: Tue, 23 Apr 2019 23:32:27 +0000 (+0200)
Subject: Merge branch 'bpf-proto-fixes'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a21b48a2f2afa53bbc989cce6fc81edbed39eab0;p=linux.git

Merge branch 'bpf-proto-fixes'

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>
---

a21b48a2f2afa53bbc989cce6fc81edbed39eab0