]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 955699a eca49b0)
Merge branch 'ipv6-add-ip6erspan-collect_md-mode'
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Dec 2017 19:45:29 +0000 (14:45 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Dec 2017 19:45:29 +0000 (14:45 -0500)
commitc231ddc703d1893136c2997d2188d2d5b59d278c
tree334d978fd0c89f585b2e604ffe92ea06317e9b34tree | snapshot
parent955699ab6414871cbb60250fc4348b69021a456acommit | diff
parenteca49b0da8eb077ad48775d9ca26fdf6ac7ba0e0commit | diff
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>
Linux Kernel Source Tree.