diff options
author | Jiri Benc <jbenc@redhat.com> | 2016-02-18 05:22:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-02-18 14:34:54 -0500 |
commit | 7f290c94352e59b1d720055fce760a69a63bd0a1 (patch) | |
tree | f6c595f28145dc17d4dd983c0e0d64c19e1ebbfd /include/net/ip_tunnels.h | |
parent | c9e78efb6f668c42e0e0f47398e814b758b95336 (diff) |
iptunnel: scrub packet in iptunnel_pull_header
Part of skb_scrub_packet was open coded in iptunnel_pull_header. Let it call
skb_scrub_packet directly instead.
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index 87408ab80856..4dd616376fec 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h | |||
@@ -270,7 +270,8 @@ static inline u8 ip_tunnel_ecn_encap(u8 tos, const struct iphdr *iph, | |||
270 | return INET_ECN_encapsulate(tos, inner); | 270 | return INET_ECN_encapsulate(tos, inner); |
271 | } | 271 | } |
272 | 272 | ||
273 | int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto); | 273 | int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto, |
274 | bool xnet); | ||
274 | void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, | 275 | void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, |
275 | __be32 src, __be32 dst, u8 proto, | 276 | __be32 src, __be32 dst, u8 proto, |
276 | u8 tos, u8 ttl, __be16 df, bool xnet); | 277 | u8 tos, u8 ttl, __be16 df, bool xnet); |