gre: Use inner mac length when computing tunnel length
authorTom Herbert <therbert@google.com>
Thu, 30 Oct 2014 15:40:56 +0000 (08:40 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 Nov 2014 16:59:43 +0000 (08:59 -0800)
commitabe640984aa492652232b65d3579361cf6d461f5
tree046f57143c634397fe0bd532fc537933a12c55b5
parent7699796d0414f711a2a0017a060530fab7939534
gre: Use inner mac length when computing tunnel length

[ Upstream commit 14051f0452a2c26a3f4791e6ad6a435e8f1945ff ]

Currently, skb_inner_network_header is used but this does not account
for Ethernet header for ETH_P_TEB. Use skb_inner_mac_header which
handles TEB and also should work with IP encapsulation in which case
inner mac and inner network headers are the same.

Tested: Ran TCP_STREAM over GRE, worked as expected.

Signed-off-by: Tom Herbert <therbert@google.com>
Acked-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv4/gre_offload.c