diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-20 15:42:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-20 15:42:38 -0700 |
| commit | 08617f47eaf8c70b4c236dee2014c6141aa282bf (patch) | |
| tree | 843d49a4140901de8dd9bb147440b27c819c388a /include/net/flow.h | |
| parent | 938049e18dca57bcd2f93986fc1cbb5a83cdf027 (diff) | |
| parent | 32a2b002ce615eadd3bfaddabde290f70a1dd17b (diff) | |
Merge branch 'lwt-ipv6'
Jiri Benc says:
====================
lwtunnel: per route ipv6 support for vxlan
v3: Moved LWTUNNEL_ENCAP_IP6 definition in patch 13.
v2: Fixed issues in patch 4 pointed out by Alexei.
This series enables IPv6 tunnels based on lwtunnel infrastructure. Only
vxlan is supported for now.
Tested in all combinations of IPv4 over IPv6, IPv6 over IPv4 and IPv6 over
IPv6.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/flow.h')
| -rw-r--r-- | include/net/flow.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/flow.h b/include/net/flow.h index f305588fc162..9e0297c4c11d 100644 --- a/include/net/flow.h +++ b/include/net/flow.h @@ -130,6 +130,7 @@ struct flowi6 { #define flowi6_proto __fl_common.flowic_proto #define flowi6_flags __fl_common.flowic_flags #define flowi6_secid __fl_common.flowic_secid +#define flowi6_tun_key __fl_common.flowic_tun_key struct in6_addr daddr; struct in6_addr saddr; __be32 flowlabel; |