aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_gre.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 14:34:54 -0500
commit7f290c94352e59b1d720055fce760a69a63bd0a1 (patch)
treef6c595f28145dc17d4dd983c0e0d64c19e1ebbfd /net/ipv4/ip_gre.c
parentvxlan: move vxlan device lookup before iptunnel_pull_header (diff)
downloadlinux-dev-7f290c94352e59b1d720055fce760a69a63bd0a1.tar.xz
linux-dev-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/ip_gre.c')
-rw-r--r--net/ipv4/ip_gre.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 917c2c1bfadd..12071e28d958 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -238,7 +238,7 @@ static int parse_gre_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,
return -EINVAL;
}
}
- return iptunnel_pull_header(skb, hdr_len, tpi->proto);
+ return iptunnel_pull_header(skb, hdr_len, tpi->proto, false);
}
static void ipgre_err(struct sk_buff *skb, u32 info,