diff options
| author | Jiri Benc <jbenc@redhat.com> | 2016-02-18 11:22:52 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-18 20:34:54 +0100 |
| commit | 7f290c94352e59b1d720055fce760a69a63bd0a1 (patch) | |
| tree | f6c595f28145dc17d4dd983c0e0d64c19e1ebbfd /include/net/ip_tunnels.h | |
| parent | vxlan: move vxlan device lookup before iptunnel_pull_header (diff) | |
| download | linux-7f290c94352e59b1d720055fce760a69a63bd0a1.tar.xz linux-7f290c94352e59b1d720055fce760a69a63bd0a1.zip | |
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, return INET_ECN_encapsulate(tos, inner); } -int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto); +int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto, + bool 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); |