diff options
| author |   Tom Herbert <tom@herbertland.com> | 2016-05-18 09:06:13 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-05-20 18:03:16 -0400 |
| commit | 55c2bc1432241e7be39b11339bd00e85f878ebd6 (patch) | |
| tree | 33b4dfd243b3164041732dbbb2366fd05e4274a7 /net/ipv4/ip_tunnel_core.c | |
| parent | ipv6: Change "final" protocol processing for encapsulation (diff) | |
| download | linux-dev-55c2bc1432241e7be39b11339bd00e85f878ebd6.tar.xz linux-dev-55c2bc1432241e7be39b11339bd00e85f878ebd6.zip | |
net: Cleanup encap items in ip_tunnels.h
Consolidate all the ip_tunnel_encap definitions in one spot in the
header file. Also, move ip_encap_hlen and ip_tunnel_encap from
ip_tunnel.c to ip_tunnels.h so they call be called without a dependency
on ip_tunnel module. Similarly, move iptun_encaps to ip_tunnel_core.c.
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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c index 9118b0e640ba..cc66a2043e6d 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c @@ -47,6 +47,10 @@ #include <net/rtnetlink.h> #include <net/dst_metadata.h> +const struct ip_tunnel_encap_ops __rcu * + iptun_encaps[MAX_IPTUN_ENCAP_OPS] __read_mostly; +EXPORT_SYMBOL(iptun_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) |