From: David S. Miller <davem@davemloft.net>
Date: Wed, 6 Dec 2017 19:45:29 +0000 (-0500)
Subject: Merge branch 'ipv6-add-ip6erspan-collect_md-mode'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3a9ab393287b64c96eee94001d0efed2a66f0be9;p=linux.git

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

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

3a9ab393287b64c96eee94001d0efed2a66f0be9