summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipip.c
diff options
context:
space:
mode:
authorJiri Benc <jbenc@redhat.com>2016-02-18 11:22:52 +0100
committerDavid S. Miller <davem@davemloft.net>2016-02-18 20:34:54 +0100
commit7f290c94352e59b1d720055fce760a69a63bd0a1 (patch)
treef6c595f28145dc17d4dd983c0e0d64c19e1ebbfd /net/ipv4/ipip.c
parentvxlan: move vxlan device lookup before iptunnel_pull_header (diff)
downloadlinux-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 'net/ipv4/ipip.c')
-rw-r--r--net/ipv4/ipip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 6ec5b42fd172..ec51d02166de 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -195,7 +195,7 @@ static int ipip_rcv(struct sk_buff *skb)
if (tunnel) {
if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))
goto drop;
- if (iptunnel_pull_header(skb, 0, tpi.proto))
+ if (iptunnel_pull_header(skb, 0, tpi.proto, false))
goto drop;
return ip_tunnel_rcv(tunnel, skb, &tpi, NULL, log_ecn_error);
}