]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
gre: Set inner mac header in gro complete
authorTom Herbert <therbert@google.com>
Sat, 29 Nov 2014 17:59:45 +0000 (09:59 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 16 Dec 2014 17:37:10 +0000 (09:37 -0800)
commit5f4cfd32b21e509325111e72b27aff2e273f11f8
treed64c27cab5ec7c327f5fcd257a0ca1e0ea5da85f
parent3e66aad18b516bd6c2b317cd8f01537ae59aa957
gre: Set inner mac header in gro complete

[ Upstream commit 6fb2a756739aa507c1fd5b8126f0bfc2f070dc46 ]

Set the inner mac header to point to the GRE payload when
doing GRO. This is needed if we proceed to send the packet
through GRE GSO which now uses the inner mac header instead
of inner network header to determine the length of encapsulation
headers.

Fixes: 14051f0452a2 ("gre: Use inner mac length when computing tunnel length")
Reported-by: Wolfgang Walter <linux@stwm.de>
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv4/gre_offload.c