diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-17 16:13:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-17 16:13:16 +0200 |
| commit | fd9527f404d51e50f40dac0d9a69f2eff3dac33e (patch) | |
| tree | 6a13c4e0b613b960b60c1dfe46c6209b49ef1605 /net/sctp/outqueue.c | |
| parent | l2tp: constify net_device_ops structures (diff) | |
| parent | samples/bpf: add comprehensive ipip, ipip6, ip6ip6 test (diff) | |
| download | linux-fd9527f404d51e50f40dac0d9a69f2eff3dac33e.tar.xz linux-fd9527f404d51e50f40dac0d9a69f2eff3dac33e.zip | |
Merge branch 'ip_tunnel-collect_md'
Alexei Starovoitov says:
====================
ip_tunnel: add collect_md mode to IPv4/IPv6 tunnels
Similar to geneve, vxlan, gre tunnels implement 'collect metadata' mode
in ipip, ipip6, ip6ip6 tunnels.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions