diff options
| author | Jiri Benc <jbenc@redhat.com> | 2016-04-05 14:47:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-06 16:50:32 -0400 |
| commit | a6d5bbf34efa8330af7b0b1dba0f38148516ed97 (patch) | |
| tree | 03db6af256a68f9626c65f0fed25cb1464fbf00a /include/net/ip_tunnels.h | |
| parent | 47e5d1b06305e73afc917f47b65490adb06c7194 (diff) | |
| download | talos-obmc-linux-a6d5bbf34efa8330af7b0b1dba0f38148516ed97.tar.gz talos-obmc-linux-a6d5bbf34efa8330af7b0b1dba0f38148516ed97.zip | |
ip_tunnel: implement __iptunnel_pull_header
Allow calling of iptunnel_pull_header without special casing ETH_P_TEB inner
protocol.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip_tunnels.h')
| -rw-r--r-- | include/net/ip_tunnels.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index 56050f913339..16435d8b1f93 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h @@ -295,8 +295,15 @@ static inline u8 ip_tunnel_ecn_encap(u8 tos, const struct iphdr *iph, return INET_ECN_encapsulate(tos, inner); } -int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto, - bool xnet); +int __iptunnel_pull_header(struct sk_buff *skb, int hdr_len, + __be16 inner_proto, bool raw_proto, bool xnet); + +static inline int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, + __be16 inner_proto, bool xnet) +{ + return __iptunnel_pull_header(skb, hdr_len, inner_proto, false, xnet); +} + 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); |
