diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-09-17 10:13:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-17 10:13:16 -0400 |
| commit | fd9527f404d51e50f40dac0d9a69f2eff3dac33e (patch) | |
| tree | 6a13c4e0b613b960b60c1dfe46c6209b49ef1605 /include/uapi | |
| parent | l2tp: constify net_device_ops structures (diff) | |
| parent | samples/bpf: add comprehensive ipip, ipip6, ip6ip6 test (diff) | |
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 'include/uapi')
| -rw-r--r-- | include/uapi/linux/if_tunnel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h index 9865c8caedde..18d5dc13985d 100644 --- a/include/uapi/linux/if_tunnel.h +++ b/include/uapi/linux/if_tunnel.h @@ -73,6 +73,7 @@ enum { IFLA_IPTUN_ENCAP_FLAGS, IFLA_IPTUN_ENCAP_SPORT, IFLA_IPTUN_ENCAP_DPORT, + IFLA_IPTUN_COLLECT_METADATA, __IFLA_IPTUN_MAX, }; #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) |