diff options
| author |   Tom Herbert <tom@herbertland.com> | 2016-05-18 09:06:17 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-05-20 18:03:16 -0400 |
| commit | 058214a4d1dfefed9f01a277fadd3590acb5f990 (patch) | |
| tree | 7e5cf28fa708e770eb94af2223d09d6446d37fc2 /net/ipv4/ip_tunnel_core.c | |
| parent | fou: Support IPv6 in fou (diff) | |
| download | linux-dev-058214a4d1dfefed9f01a277fadd3590acb5f990.tar.xz linux-dev-058214a4d1dfefed9f01a277fadd3590acb5f990.zip | |
ip6_tun: Add infrastructure for doing encapsulation
Add encap_hlen and ip_tunnel_encap structure to ip6_tnl. Add functions
for getting encap hlen, setting up encap on a tunnel, performing
encapsulation operation.
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_tunnel_core.c')
| -rw-r--r-- | net/ipv4/ip_tunnel_core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c index cc66a2043e6d..afd6b5968caf 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c @@ -37,6 +37,7 @@ #include <net/icmp.h> #include <net/protocol.h> #include <net/ip_tunnels.h> +#include <net/ip6_tunnel.h> #include <net/arp.h> #include <net/checksum.h> #include <net/dsfield.h> @@ -51,6 +52,10 @@ const struct ip_tunnel_encap_ops __rcu * iptun_encaps[MAX_IPTUN_ENCAP_OPS] __read_mostly; EXPORT_SYMBOL(iptun_encaps); +const struct ip6_tnl_encap_ops __rcu * + ip6tun_encaps[MAX_IPTUN_ENCAP_OPS] __read_mostly; +EXPORT_SYMBOL(ip6tun_encaps); + void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, __be32 src, __be32 dst, __u8 proto, __u8 tos, __u8 ttl, __be16 df, bool xnet) |