summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPravin B Shelar <pshelar@nicira.com>2013-10-28 10:38:55 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-20 12:27:46 -0800
commitb9099fea22395af057dec42c678f47cf746cc998 (patch)
tree9dedc99a0486b8f291861d7c5e9c02c196bc78e3 /include
parent3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff)
downloadlinux-3.10-b9099fea22395af057dec42c678f47cf746cc998.tar.gz
linux-3.10-b9099fea22395af057dec42c678f47cf746cc998.tar.bz2
linux-3.10-b9099fea22395af057dec42c678f47cf746cc998.zip
ip_gre: Fix WCCPv2 header parsing.
[ No applicable upstream commit, the upstream implementation is now completely different and doesn't have this bug. ] In case of WCCPv2 GRE header has extra four bytes. Following patch pull those extra four bytes so that skb offsets are set correctly. CC: Eric Dumazet <eric.dumazet@gmail.com> Reported-by: Peter Schmitt <peter.schmitt82@yahoo.de> Tested-by: Peter Schmitt <peter.schmitt82@yahoo.de> Signed-off-by: Pravin B Shelar <pshelar@nicira.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/net/ip_tunnels.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index a9942e1faef..7ac7f91f024 100644
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -113,7 +113,7 @@ struct ip_tunnel *ip_tunnel_lookup(struct ip_tunnel_net *itn,
__be32 key);
int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb,
- const struct tnl_ptk_info *tpi, bool log_ecn_error);
+ const struct tnl_ptk_info *tpi, int hdr_len, bool log_ecn_error);
int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],
struct ip_tunnel_parm *p);
int ip_tunnel_newlink(struct net_device *dev, struct nlattr *tb[],