ip_gre: Fix WCCPv2 header parsing.
authorPravin B Shelar <pshelar@nicira.com>
Mon, 28 Oct 2013 17:38:55 +0000 (10:38 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Nov 2013 20:27:46 +0000 (12:27 -0800)
commitb9099fea22395af057dec42c678f47cf746cc998
tree9dedc99a0486b8f291861d7c5e9c02c196bc78e3
parent3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5
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>
include/net/ip_tunnels.h
net/ipv4/ip_gre.c
net/ipv4/ip_tunnel.c
net/ipv4/ipip.c