Commit a6d5bbf3 authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

ip_tunnel: implement __iptunnel_pull_header 



Allow calling of iptunnel_pull_header without special casing ETH_P_TEB inner
protocol.

Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47e5d1b0

include/net/ip_tunnels.h

+9 −2
Original line number Diff line number Diff line
@@ -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);

net/ipv4/ip_tunnel_core.c

+4 −4
Original line number Diff line number Diff line
@@ -86,15 +86,15 @@ void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, 
}

EXPORT_SYMBOL_GPL(iptunnel_xmit);



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)

{

	if (unlikely(!pskb_may_pull(skb, hdr_len)))

		return -ENOMEM;



	skb_pull_rcsum(skb, hdr_len);



	if (inner_proto == htons(ETH_P_TEB)) {

	if (!raw_proto && inner_proto == htons(ETH_P_TEB)) {

		struct ethhdr *eh;



		if (unlikely(!pskb_may_pull(skb, ETH_HLEN)))
@@ -117,7 +117,7 @@ int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto, 


	return iptunnel_pull_offloads(skb);

}

EXPORT_SYMBOL_GPL(iptunnel_pull_header);

EXPORT_SYMBOL_GPL(__iptunnel_pull_header);



struct metadata_dst *iptunnel_metadata_reply(struct metadata_dst *md,

					     gfp_t flags)