diff options
| author | Tom Herbert <tom@herbertland.com> | 2016-04-30 02:12:18 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-03 01:23:31 +0200 |
| commit | 8eb30be0352d09165e94a41fef1c7b994dca0714 (patch) | |
| tree | 06b2c8e831f66279c6acd772bf2830d4bea0bc2f /include/net/ip6_tunnel.h | |
| parent | gre6: Cleanup GREv6 receive path, call common GRE functions (diff) | |
| download | linux-8eb30be0352d09165e94a41fef1c7b994dca0714.tar.xz linux-8eb30be0352d09165e94a41fef1c7b994dca0714.zip | |
ipv6: Create ip6_tnl_xmit
This patch renames ip6_tnl_xmit2 to ip6_tnl_xmit and exports it. Other
users like GRE will be able to call this. The original ip6_tnl_xmit
function is renamed to ip6_tnl_start_xmit (this is an ndo_start_xmit
function).
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip6_tunnel.h')
| -rw-r--r-- | include/net/ip6_tunnel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h index eab3a9b19ae0..835491bd5636 100644 --- a/include/net/ip6_tunnel.h +++ b/include/net/ip6_tunnel.h @@ -69,6 +69,8 @@ int ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb, bool log_ecn_error); int ip6_tnl_xmit_ctl(struct ip6_tnl *t, const struct in6_addr *laddr, const struct in6_addr *raddr); +int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield, + struct flowi6 *fl6, int encap_limit, __u32 *pmtu, __u8 proto); __u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw); __u32 ip6_tnl_get_cap(struct ip6_tnl *t, const struct in6_addr *laddr, const struct in6_addr *raddr); |